fixed #279: call set method with muted listeners

amsul · Dec 1, 2013 · f4cbdad · f4cbdad
1 parent f2c8d04
commit f4cbdad
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/_raw/lib/picker.js b/_raw/lib/picker.js
@@ -479,6 +479,9 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                     thingIsObject = $.isPlainObject( thing ),
                     thingObject = thingIsObject ? thing : {}
 
+                // Make sure we have usable options.
+                options = thingIsObject && $.isPlainObject( value ) ? value : options || {}
+
                 if ( thing ) {
 
                     // If the thing isn’t an object, make it one.
@@ -494,7 +497,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
 
                         // First, if the item exists and there’s a value, set it.
                         if ( P.component.item[ thingItem ] ) {
-                            P.component.set( thingItem, thingValue, options || {} )
+                            P.component.set( thingItem, thingValue, options )
                         }
 
                         // Then, check to update the element value and broadcast a change.
@@ -509,8 +512,8 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                     P.render()
                 }
 
-                // Trigger queued “set” events and pass the `thingObject`.
-                return P.trigger( 'set', thingObject )
+                // When the method isn’t muted, trigger queued “set” events and pass the `thingObject`.
+                return options.muted ? P : P.trigger( 'set', thingObject )
             }, //set
 
 

diff --git a/lib/compressed/picker.js b/lib/compressed/picker.js
diff --git a/lib/picker.js b/lib/picker.js
@@ -479,6 +479,9 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                     thingIsObject = $.isPlainObject( thing ),
                     thingObject = thingIsObject ? thing : {}
 
+                // Make sure we have usable options.
+                options = thingIsObject && $.isPlainObject( value ) ? value : options || {}
+
                 if ( thing ) {
 
                     // If the thing isn’t an object, make it one.
@@ -494,7 +497,7 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
 
                         // First, if the item exists and there’s a value, set it.
                         if ( P.component.item[ thingItem ] ) {
-                            P.component.set( thingItem, thingValue, options || {} )
+                            P.component.set( thingItem, thingValue, options )
                         }
 
                         // Then, check to update the element value and broadcast a change.
@@ -509,8 +512,8 @@ function PickerConstructor( ELEMENT, NAME, COMPONENT, OPTIONS ) {
                     P.render()
                 }
 
-                // Trigger queued “set” events and pass the `thingObject`.
-                return P.trigger( 'set', thingObject )
+                // When the method isn’t muted, trigger queued “set” events and pass the `thingObject`.
+                return options.muted ? P : P.trigger( 'set', thingObject )
             }, //set
 
 

diff --git a/tests/dev/date.htm b/tests/dev/date.htm
@@ -100,6 +100,14 @@ <h3><label for="input_01">Pick a date. Go ahead...</label></h3>
 
         var picker = $input.pickadate('picker')
 
+        picker.on('set', function(selection) {
+            console.log( selection )
+        })
+
+        picker.set('select', new Date())
+        picker.set('select', new Date(), { muted: true })
+        picker.set({ select: new Date() }, { muted: true })
+
     </script>
 
 

diff --git a/tests/units/base.js b/tests/units/base.js
@@ -306,6 +306,21 @@ test( 'As multiple methods', 6, function() {
         trigger( 'set' )
 })
 
+test( 'As muted methods', 1, function() {
+
+    var picker = this.picker
+
+    // Bind the callback.
+    picker.on('set', function() {
+        ok( true, 'An outspoken method' )
+    })
+
+    // Do the selections.
+    picker.set('select', new Date())
+    picker.set('select', new Date(), { muted: true })
+    picker.set({ select: new Date() }, { muted: true })
+})
+
 test( 'Open/close alternate focus', function() {
 
     var picker = this.picker,