Handle logic corner case in isMutationRecord uberVU#92

valentinzberea · Jun 5, 2013 · 1f0cc7d · 1f0cc7d
1 parent 9f54536
commit 1f0cc7d
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/core/widget_starter.coffee b/core/widget_starter.coffee
@@ -79,16 +79,20 @@ define ['cs!mozaic_module', 'cs!pubsub'], (Module) ->
             isMutationRecord =
                 mutation.type is 'attributes' and
                 mutation.attributeName is 'class' and
-                nodeClassName?.indexOf('mozaic-widget') isnt -1 and # Must be widget.
-                mutation.oldValue?.indexOf(Constants.DELAY_WIDGET) isnt -1 and # Should have been delayed
-                nodeClassName?.indexOf(Constants.DELAY_WIDGET) is -1 # Should not be delayed anymore
+                nodeClassName? and
+                nodeClassName.indexOf('mozaic-widget') isnt -1 and # Must be widget.
+                mutation.oldValue? and
+                mutation.oldValue.indexOf(Constants.DELAY_WIDGET) isnt -1 and # Should have been delayed
+                nodeClassName.indexOf(Constants.DELAY_WIDGET) is -1 # Should not be delayed anymore
 
             isMutationEvent = # for DOM Mutation Events
                 mutation.attrChange is 1 and # MODIFICATION type change.
                 mutation.attrName is 'class' and # Changed attr should be a class.
-                mutation.newValue?.indexOf('mozaic-widget') isnt -1 and # Element should be a widget.
-                mutation.newValue?.indexOf(Constants.DELAY_WIDGET) is -1 and # Element should no longer be delayed.
-                mutation.prevValue?.indexOf(Constants.DELAY_WIDGET) isnt -1 # Element was previously marked as delayed.
+                mutation.newValue? and
+                mutation.newValue.indexOf('mozaic-widget') isnt -1 and # Element should be a widget.
+                mutation.newValue.indexOf(Constants.DELAY_WIDGET) is -1 and # Element should no longer be delayed.
+                mutation.prevValue? and
+                mutation.prevValue.indexOf(Constants.DELAY_WIDGET) isnt -1 # Element was previously marked as delayed.
 
             return isMutationRecord or isMutationEvent