Merge pull request #3776 from aaronsakowski/master

timoschilling · timoschilling · commit b3a9f4b3e405 · 2015-01-30T09:29:31.000+01:00
Ambiguous coffeescript leading to occasional javascript errors
diff --git a/app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee b/app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee
@@ -1,7 +1,7 @@
 class ActiveAdmin.CheckboxToggler
   constructor: (@options, @container)->
     defaults = {}
-    @options = $.extend defaults, options
+    @options = $.extend defaults, @options
     @_init()
     @_bind()
 
diff --git a/app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee b/app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee
@@ -9,7 +9,7 @@ class ActiveAdmin.DropdownMenu
       onClickActionItemCallback: null
     }
 
-    @options = $.extend defaults, options
+    @options = $.extend defaults, @options
     @isOpen  = false
 
     @$menuButton = @$element.find '.dropdown_menu_button'

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class ActiveAdmin.DropdownMenu`
`9`	`9`	`onClickActionItemCallback: null`
`10`	`10`	`}`
`11`	`11`
`12`		`- @options = $.extend defaults, options`
	`12`	`+ @options = $.extend defaults, @options`
`13`	`13`	`@isOpen = false`
`14`	`14`
`15`	`15`	`@$menuButton = @$element.find '.dropdown_menu_button'`