backport of activeadmin#3776

fixes activeadmin#3779
mycolorway · May 11, 2017 · aae9601 · aae9601
1 parent fea5d43
commit aae9601
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/active_admin/components/jquery.aa.checkbox-toggler.js.coffee b/app/assets/javascripts/active_admin/components/jquery.aa.checkbox-toggler.js.coffee
@@ -1,7 +1,7 @@
 window.AA.CheckboxToggler = class AA.CheckboxToggler
   constructor: (@options, @container)->
     defaults = {}
-    @options = $.extend {}, defaults, options
+    @options = $.extend {}, defaults, @options
     @_init()
     @_bind()
 

diff --git a/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee b/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee
@@ -10,7 +10,7 @@ window.AA.DropdownMenu = class AA.DropdownMenu
       onClickActionItemCallback: null
     }
 
-    @options = $.extend({}, defaults, options)
+    @options = $.extend({}, defaults, @options)
 
     @$menuButton = @$element.find(".dropdown_menu_button")
     @$menuList = @$element.find(".dropdown_menu_list_wrapper")