add locks to update everywhere by using options to pass this

(and check for this)

IPython/html/static/notebook/js/widgets/widget_bool.js

@@ -1,133 +1,129 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // BoolWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     
     var BoolWidgetModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('BoolWidgetModel', BoolWidgetModel);
 
     var CheckboxView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single');
             this.$label = $('<div />')
                 .addClass('widget-hlabel')
                 .appendTo(this.$el)
                 .hide();
             var that = this;
             this.$checkbox = $('<input />')
                 .attr('type', 'checkbox')
                 .click(function(el) {
-                    that.user_invoked_update = true;
             
                     // Calling model.set will trigger all of the other views of the 
                     // model to update.
-                    that.model.set('value', that.$checkbox.prop('checked'));
+                    that.model.set('value', that.$checkbox.prop('checked'), {updated_view: this});
                     that.touch();
-                    that.user_invoked_update = false;
                 })
                 .appendTo(this.$el);
 
             this.$el_to_style = this.$checkbox; // Set default element to style
             this.update(); // Set defaults.
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            if (!this.user_invoked_update) {
+            if (options === undefined || options.updated_view != this) {
                 this.$checkbox.prop('checked', this.model.get('value'));
 
                 var disabled = this.model.get('disabled');
                 this.$checkbox.prop('disabled', disabled);
 
                 var description = this.model.get('description');
                 if (description.length === 0) {
                     this.$label.hide();
                 } else {
                     this.$label.html(description);
                     this.$label.show();
                 }
             }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
     });
 
     widget_manager.register_widget_view('CheckboxView', CheckboxView);
 
     var ToggleButtonView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render : function(){
             this.$el
                 .html('');
             this.$button = $('<button />')
                 .addClass('btn')
                 .attr('type', 'button')
                 .attr('data-toggle', 'button')
                 .appendTo(this.$el);
             this.$el_to_style = this.$button; // Set default element to style
 
             this.update(); // Set defaults.
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            if (!this.user_invoked_update) {
+            if (options === undefined || options.updated_view != this) {
                 if (this.model.get('value')) {
                     this.$button.addClass('active');
                 } else {
                     this.$button.removeClass('active');
                 }
 
                 var disabled = this.model.get('disabled');
                 this.$button.prop('disabled', disabled);
 
                 var description = this.model.get('description');
                 if (description.length === 0) {
                     this.$button.html(' '); // Preserve button height
                 } else {
                     this.$button.html(description);
                 }
             }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         events: {"click button" : "handleClick"},
         
         // Handles and validates user input.
         handleClick: function(e) { 
-            this.user_invoked_update = true;
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', ! $(e.target).hasClass('active'));
+            this.model.set('value', ! $(e.target).hasClass('active'), {updated_view: this});
             this.touch();
-            this.user_invoked_update = false;
         },
     });
 
     widget_manager.register_widget_view('ToggleButtonView', ToggleButtonView);
 
 });

IPython/html/static/notebook/js/widgets/widget_float_range.js

@@ -1,269 +1,271 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // FloatRangeWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     var FloatRangeWidgetModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('FloatRangeWidgetModel', FloatRangeWidgetModel);
 
     var FloatSliderView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$slider = $('<div />')
                 .slider({})
                 .addClass('slider');
             
             // Put the slider in a container 
             this.$slider_container = $('<div />')
                 .addClass('widget-hslider')
                 .append(this.$slider);    
             this.$el_to_style = this.$slider_container; // Set default element to style
             this.$el.append(this.$slider_container);
             
             // Set defaults.
             this.update();
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
 
+            if (options === undefined || options.updated_view != this) {
             // Slider related keys.
             var _keys = ['step', 'max', 'min', 'disabled'];
             for (var index in _keys) {
                 var key = _keys[index];
                 if (this.model.get(key) !== undefined) {
                     this.$slider.slider("option", key, this.model.get(key));
                 }
             }
 
             // WORKAROUND FOR JQUERY SLIDER BUG.
             // The horizontal position of the slider handle
             // depends on the value of the slider at the time
             // of orientation change.  Before applying the new
             // workaround, we set the value to the minimum to
             // make sure that the horizontal placement of the
             // handle in the vertical slider is always 
             // consistent.
             var orientation = this.model.get('orientation');
             var value = this.model.get('min');
             this.$slider.slider('option', 'value', value);
             this.$slider.slider('option', 'orientation', orientation);
             value = this.model.get('value');
             this.$slider.slider('option', 'value', value);
 
             // Use the right CSS classes for vertical & horizontal sliders
             if (orientation=='vertical') {
                 this.$slider_container
                     .removeClass('widget-hslider')
                     .addClass('widget-vslider');
                 this.$el
                     .removeClass('widget-hbox-single')
                     .addClass('widget-vbox-single');
                 this.$label
                     .removeClass('widget-hlabel')
                     .addClass('widget-vlabel');
 
             } else {
                 this.$slider_container
                     .removeClass('widget-vslider')
                     .addClass('widget-hslider');
                 this.$el
                     .removeClass('widget-vbox-single')
                     .addClass('widget-hbox-single');
                 this.$label
                     .removeClass('widget-vlabel')
                     .addClass('widget-hlabel');
             }
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         // Handles: User input
         events: { "slide" : "handleSliderChange" }, 
         handleSliderChange: function(e, ui) { 
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', ui.value); 
+            this.model.set('value', ui.value, {updated_view: this}); 
             this.touch();
         },
     });
 
     widget_manager.register_widget_view('FloatSliderView', FloatSliderView);
 
 
     var FloatTextView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$textbox = $('<input type="text" />')
                 .addClass('input')
                 .addClass('widget-numeric-text')
                 .appendTo(this.$el);
             this.$el_to_style = this.$textbox; // Set default element to style
             this.update(); // Set defaults.
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
 
+            if (options === undefined || options.updated_view != this) {
             var value = this.model.get('value');
-            if (!this.changing && parseFloat(this.$textbox.val()) != value) {
+                if (parseFloat(this.$textbox.val()) != value) {
                 this.$textbox.val(value);
             }
             
             if (this.model.get('disabled')) {
                 this.$textbox.attr('disabled','disabled');
             } else {
                 this.$textbox.removeAttr('disabled');
             }
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         
         events: {"keyup input" : "handleChanging",
                 "paste input" : "handleChanging",
                 "cut input" : "handleChanging",
                 "change input" : "handleChanged"}, // Fires only when control is validated or looses focus.
         
         // Handles and validates user input.
         handleChanging: function(e) { 
             
             // Try to parse value as a float.
             var numericalValue = 0.0;
             if (e.target.value !== '') {
                 numericalValue = parseFloat(e.target.value);
             }
             
             // If parse failed, reset value to value stored in model.
             if (isNaN(numericalValue)) {
                 e.target.value = this.model.get('value');
             } else if (!isNaN(numericalValue)) {
                 if (this.model.get('max') !== undefined) {
                     numericalValue = Math.min(this.model.get('max'), numericalValue);
                 }
                 if (this.model.get('min') !== undefined) {
                     numericalValue = Math.max(this.model.get('min'), numericalValue);
                 }
 
                 // Apply the value if it has changed.
                 if (numericalValue != this.model.get('value')) {
-                    this.changing = true;
             
                     // Calling model.set will trigger all of the other views of the 
                     // model to update.
-                    this.model.set('value', numericalValue);
+                    this.model.set('value', numericalValue, {updated_view: this});
                     this.touch();
-                    this.changing = false;
                 }
             }
         },
         
         // Applies validated input.
         handleChanged: function(e) { 
             // Update the textbox
             if (this.model.get('value') != e.target.value) {
                 e.target.value = this.model.get('value');
             }
         }
     });
 
     widget_manager.register_widget_view('FloatTextView', FloatTextView);
 
 
     var ProgressView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$progress = $('<div />')
                 .addClass('progress')
                 .addClass('widget-progress')
                 .appendTo(this.$el);
             this.$el_to_style = this.$progress; // Set default element to style
             this.$bar = $('<div />')
                 .addClass('bar')
                 .css('width', '50%')
                 .appendTo(this.$progress);
             this.update(); // Set defaults.
         },
         
         update : function(){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
             var value = this.model.get('value');
             var max = this.model.get('max');
             var min = this.model.get('min');
             var percent = 100.0 * (value - min) / (max - min);
             this.$bar.css('width', percent + '%');
             
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
     });
 
     widget_manager.register_widget_view('ProgressView', ProgressView);
 });

IPython/html/static/notebook/js/widgets/widget_int_range.js

@@ -1,219 +1,219 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // IntRangeWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     var IntRangeWidgetModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('IntRangeWidgetModel', IntRangeWidgetModel);
 
     var IntSliderView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$slider = $('<div />')
                 .slider({})
                 .addClass('slider');
             
             // Put the slider in a container 
             this.$slider_container = $('<div />')
                 .addClass('widget-hslider')
                 .append(this.$slider);    
             this.$el_to_style = this.$slider_container; // Set default element to style
             this.$el.append(this.$slider_container);
             
             // Set defaults.
             this.update();
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-
+            if (options === undefined || options.updated_view != this) {
             // Slider related keys.
             var _keys = ['step', 'max', 'min', 'disabled'];
             for (var index in _keys) {
                 var key = _keys[index];
                 if (this.model.get(key) !== undefined) {
                     this.$slider.slider("option", key, this.model.get(key));
                 }
             }
 
             // WORKAROUND FOR JQUERY SLIDER BUG.
             // The horizontal position of the slider handle
             // depends on the value of the slider at the time
             // of orientation change.  Before applying the new
             // workaround, we set the value to the minimum to
             // make sure that the horizontal placement of the
             // handle in the vertical slider is always 
             // consistent.
             var orientation = this.model.get('orientation');
             var value = this.model.get('min');
             this.$slider.slider('option', 'value', value);
             this.$slider.slider('option', 'orientation', orientation);
             value = this.model.get('value');
             this.$slider.slider('option', 'value', value);
 
             // Use the right CSS classes for vertical & horizontal sliders
             if (orientation=='vertical') {
                 this.$slider_container
                     .removeClass('widget-hslider')
                     .addClass('widget-vslider');
                 this.$el
                     .removeClass('widget-hbox-single')
                     .addClass('widget-vbox-single');
                 this.$label
                     .removeClass('widget-hlabel')
                     .addClass('widget-vlabel');
 
             } else {
                 this.$slider_container
                     .removeClass('widget-vslider')
                     .addClass('widget-hslider');
                 this.$el
                     .removeClass('widget-vbox-single')
                     .addClass('widget-hbox-single');
                 this.$label
                     .removeClass('widget-vlabel')
                     .addClass('widget-hlabel');
             }
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         // Handles: User input
         events: { "slide" : "handleSliderChange" }, 
         handleSliderChange: function(e, ui) { 
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', ~~ui.value); // Double bit-wise not to truncate decimel
+            this.model.set('value', ~~ui.value, {updated_view: this}); // Double bit-wise not to truncate decimel
             this.touch();
         },
     });
 
     widget_manager.register_widget_view('IntSliderView', IntSliderView);
 
     var IntTextView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$textbox = $('<input type="text" />')
                 .addClass('input')
                 .addClass('widget-numeric-text')
                 .appendTo(this.$el);
             this.$el_to_style = this.$textbox; // Set default element to style
             this.update(); // Set defaults.
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-
+            if (options === undefined || options.updated_view != this) {
             var value = this.model.get('value');
-            if (!this.changing && parseInt(this.$textbox.val()) != value) {
+                if (parseInt(this.$textbox.val()) != value) {
                 this.$textbox.val(value);
             }
             
             if (this.model.get('disabled')) {
                 this.$textbox.attr('disabled','disabled');
             } else {
                 this.$textbox.removeAttr('disabled');
             }
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         
         events: {"keyup input" : "handleChanging",
                 "paste input" : "handleChanging",
                 "cut input" : "handleChanging",
                 "change input" : "handleChanged"}, // Fires only when control is validated or looses focus.
         
         // Handles and validates user input.
         handleChanging: function(e) { 
             
             // Try to parse value as a float.
             var numericalValue = 0;
             if (e.target.value !== '') {
                 numericalValue = parseInt(e.target.value);
             }
             
             // If parse failed, reset value to value stored in model.
             if (isNaN(numericalValue)) {
                 e.target.value = this.model.get('value');
             } else if (!isNaN(numericalValue)) {
                 if (this.model.get('max') !== undefined) {
                     numericalValue = Math.min(this.model.get('max'), numericalValue);
                 }
                 if (this.model.get('min') !== undefined) {
                     numericalValue = Math.max(this.model.get('min'), numericalValue);
                 }
                 
                 // Apply the value if it has changed.
                 if (numericalValue != this.model.get('value')) {
-                    this.changing = true;
             
                     // Calling model.set will trigger all of the other views of the 
                     // model to update.
-                    this.model.set('value', numericalValue);
+                    this.model.set('value', numericalValue, {updated_view: this});
                     this.touch();
-                    this.changing = false;
                 }
             }
         },
         
         // Applies validated input.
         handleChanged: function(e) { 
             // Update the textbox
             if (this.model.get('value') != e.target.value) {
                 e.target.value = this.model.get('value');
             }
         }
     });
 
     widget_manager.register_widget_view('IntTextView', IntTextView);
 });

IPython/html/static/notebook/js/widgets/widget_multicontainer.js

@@ -1,224 +1,225 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // MultiContainerWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     var MulticontainerModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('MulticontainerWidgetModel', MulticontainerModel);
 
     var AccordionView = IPython.DOMWidgetView.extend({
         
         render: function(){
             var guid = 'accordion' + IPython.utils.uuid();
             this.$el
                 .attr('id', guid)
                 .addClass('accordion');
             this.containers = [];
             this.update_children([], this.model.get('children'));
             this.model.on('change:children', function(model, value, options) {
                 this.update_children(model.previous('children'), value);
             }, this);
         },
         
         update_children: function(old_list, new_list) {
             _.each(this.containers, function(element, index, list) {
                 element.remove();
             }, this);
             this.containers = [];
             this.update_child_views(old_list, new_list);
             _.each(new_list, function(element, index, list) {
                 this.add_child_view(this.child_views[element]);
             }, this)
         },
         
 
-        update: function() {
+        update: function(options) {
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
 
+            if (options === undefined || options.updated_view != this) {
             // Set tab titles
             var titles = this.model.get('_titles');
             for (var page_index in titles) {
 
                 var accordian = this.containers[page_index];
                 if (accordian !== undefined) {
                     accordian
                         .find('.accordion-heading')
                         .find('.accordion-toggle')
                         .html(titles[page_index]);
                 }
             }
 
             // Set selected page
             var selected_index = this.model.get("selected_index");
             if (0 <= selected_index && selected_index < this.containers.length) {
                 for (var index in this.containers) {
                     if (index==selected_index) {
                         this.containers[index].find('.accordion-body').collapse('show');    
                     } else {
                         this.containers[index].find('.accordion-body').collapse('hide');    
                     }
                     
                 }
             }
-            
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
 
         add_child_view: function(view) {
 
             var index = this.containers.length;
             var uuid = IPython.utils.uuid();
             var accordion_group = $('<div />')
                 .addClass('accordion-group')
                 .appendTo(this.$el);
             var accordion_heading = $('<div />')
                 .addClass('accordion-heading')
                 .appendTo(accordion_group);
             var that = this;
             var accordion_toggle = $('<a />')
                 .addClass('accordion-toggle')
                 .attr('data-toggle', 'collapse')
                 .attr('data-parent', '#' + this.$el.attr('id'))
                 .attr('href', '#' + uuid)
                 .click(function(evt){ 
             
                     // Calling model.set will trigger all of the other views of the 
                     // model to update.
-                    that.model.set("selected_index", index);
+                    that.model.set("selected_index", index, {updated_view: this});
                     that.touch();
                  })
                 .html('Page ' + index)
                 .appendTo(accordion_heading);
             var accordion_body = $('<div />', {id: uuid})
                 .addClass('accordion-body collapse')
                 .appendTo(accordion_group);
             var accordion_inner = $('<div />')
                 .addClass('accordion-inner')
                 .appendTo(accordion_body);
             this.containers.push(accordion_group);
             accordion_inner.append(view.$el);
 
             this.update();
 
             // Stupid workaround to close the bootstrap accordion tabs which
             // open by default even though they don't have the `in` class
             // attached to them.  For some reason a delay is required.  
             // TODO: Better fix.
             setTimeout(function(){ that.update(); }, 500);
         },
     });
 
     widget_manager.register_widget_view('AccordionView', AccordionView);
     
     var TabView = IPython.DOMWidgetView.extend({
         
         initialize: function() {
             this.containers = [];
             IPython.DOMWidgetView.prototype.initialize.apply(this, arguments);
         },
 
         render: function(){
             var uuid = 'tabs'+IPython.utils.uuid();
             var that = this;
             this.$tabs = $('<div />', {id: uuid})
                 .addClass('nav')
                 .addClass('nav-tabs')
                 .appendTo(this.$el);
             this.$tab_contents = $('<div />', {id: uuid + 'Content'})
                 .addClass('tab-content')
                 .appendTo(this.$el);
             this.containers = [];
             this.update_children([], this.model.get('children'));
             this.model.on('change:children', function(model, value, options) {
                 this.update_children(model.previous('children'), value);
             }, this);
         },
         
         update_children: function(old_list, new_list) {
             _.each(this.containers, function(element, index, list) {
                 element.remove();
             }, this);
             this.containers = [];
             this.update_child_views(old_list, new_list);
             _.each(new_list, function(element, index, list) {
                 this.add_child_view(this.child_views[element]);
             }, this)
         },
 
-        update: function() {
+        update: function(options) {
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            
+            if (options === undefined || options.updated_view != this) {
             // Set tab titles
             var titles = this.model.get('_titles');
             for (var page_index in titles) {
                 var tab_text = this.containers[page_index];
                 if (tab_text !== undefined) {
                     tab_text.html(titles[page_index]);
                 }
             }
 
             var selected_index = this.model.get('selected_index');
             if (0 <= selected_index && selected_index < this.containers.length) {
                 this.select_page(selected_index);
             }
-
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
 
         add_child_view: function(view) {
             var index = this.containers.length;
             var uuid = IPython.utils.uuid();
 
             var that = this;
             var tab = $('<li />')
                 .css('list-style-type', 'none')
                 .appendTo(this.$tabs);
             var tab_text = $('<a />')
                 .attr('href', '#' + uuid)
                 .attr('data-toggle', 'tab') 
                 .html('Page ' + index)
                 .appendTo(tab)
                 .click(function (e) {
             
                     // Calling model.set will trigger all of the other views of the 
                     // model to update.
-                    that.model.set("selected_index", index);
+                    that.model.set("selected_index", index, {updated_view: this});
                     that.touch();
                     that.select_page(index);
                 });
             this.containers.push(tab_text);
 
             var contents_div = $('<div />', {id: uuid})
                 .addClass('tab-pane')
                 .addClass('fade')
                 .append(view.$el)
                 .appendTo(this.$tab_contents);
         },
 
         select_page: function(index) {
             this.$tabs.find('li')
                 .removeClass('active');
             this.containers[index].tab('show');
         },
     });
 
     widget_manager.register_widget_view('TabView', TabView);
 });

IPython/html/static/notebook/js/widgets/widget_selection.js

@@ -1,380 +1,385 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // SelectionWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     var SelectionWidgetModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('SelectionWidgetModel', SelectionWidgetModel);
 
     var DropdownView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$buttongroup = $('<div />')
                 .addClass('widget_item')
                 .addClass('btn-group')
                 .appendTo(this.$el);
             this.$el_to_style = this.$buttongroup; // Set default element to style
             this.$droplabel = $('<button />')
                 .addClass('btn')
                 .addClass('widget-combo-btn')
                 .html('&nbsp;')
                 .appendTo(this.$buttongroup);
             this.$dropbutton = $('<button />')
                 .addClass('btn')
                 .addClass('dropdown-toggle')
                 .addClass('widget-combo-carrot-btn')
                 .attr('data-toggle', 'dropdown')
                 .html('<span class="caret"></span>')
                 .appendTo(this.$buttongroup);
             this.$droplist = $('<ul />')
                 .addClass('dropdown-menu')
                 .appendTo(this.$buttongroup);
             
             // Set defaults.
             this.update();
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
 
+            if (options === undefined || options.updated_view != this) {
             var selected_item_text = this.model.get('value');
             selected_item_text = selected_item_text.replace(/ /g, '&nbsp;');
             selected_item_text = selected_item_text.replace(/\n/g, '<br>\n');
             if (selected_item_text.length === 0) {
                 this.$droplabel.html('&nbsp;');
             } else {
                 this.$droplabel.html(selected_item_text);    
             }
             
             var items = this.model.get('values');
             this.$droplist.html('');
             for (var index in items) {
                 var that = this;
                 var item_button = $('<a href="#"/>')
                     .html(items[index])
                     .on('click', $.proxy(this.handle_click, this));
                 this.$droplist.append($('<li />').append(item_button));
             }
             
             if (this.model.get('disabled')) {
                 this.$buttongroup.attr('disabled','disabled');
                 this.$droplabel.attr('disabled','disabled');
                 this.$dropbutton.attr('disabled','disabled');
                 this.$droplist.attr('disabled','disabled');
             } else {
                 this.$buttongroup.removeAttr('disabled');
                 this.$droplabel.removeAttr('disabled');
                 this.$dropbutton.removeAttr('disabled');
                 this.$droplist.removeAttr('disabled');
             }
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
 
         // Handle when a value is clicked.
         handle_click: function (e) {
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', $(e.target).html(), this);
+            this.model.set('value', $(e.target).html(), {updated_view: this});
             this.touch();
         },
         
     });
 
     widget_manager.register_widget_view('DropdownView', DropdownView);
 
     var RadioButtonsView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$container = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-container')
                 .addClass('vbox');
             this.$el_to_style = this.$container; // Set default element to style
             this.update();
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            
+            if (options === undefined || options.updated_view != this) {
             // Add missing items to the DOM.
             var items = this.model.get('values');
             var disabled = this.model.get('disabled');
             for (var index in items) {
                 var item_query = ' :input[value="' + items[index] + '"]';
                 if (this.$el.find(item_query).length === 0) {
                     var $label = $('<label />')
                         .addClass('radio')
                         .html(items[index])
                         .appendTo(this.$container);
                     
                     $('<input />')
                         .attr('type', 'radio')
                         .addClass(this.model)
                         .val(items[index])
                         .prependTo($label)
                         .on('click', $.proxy(this.handle_click, this));
                 }
                 
                 var $item_element = this.$container.find(item_query);
                 if (this.model.get('value') == items[index]) {
                     $item_element.prop('checked', true);
                 } else {
                     $item_element.prop('checked', false);
                 }
                 $item_element.prop('disabled', disabled);
             }
             
             // Remove items that no longer exist.
             this.$container.find('input').each(function(i, obj) {
                 var value = $(obj).val();
                 var found = false;
                 for (var index in items) {
                     if (items[index] == value) {
                         found = true;
                         break;
                     }
                 }
                 
                 if (!found) {
                     $(obj).parent().remove();
                 }
             });
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
 
         // Handle when a value is clicked.
         handle_click: function (e) {
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', $(e.target).val(), this);
+            this.model.set('value', $(e.target).val(), {updated_view: this});
             this.touch();
         },
     });
 
     widget_manager.register_widget_view('RadioButtonsView', RadioButtonsView);
 
 
     var ToggleButtonsView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$buttongroup = $('<div />')
                 .addClass('btn-group')
                 .attr('data-toggle', 'buttons-radio')
                 .appendTo(this.$el);
             this.$el_to_style = this.$buttongroup; // Set default element to style
             this.update();
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            
+            if (options === undefined || options.updated_view != this) {
             // Add missing items to the DOM.
             var items = this.model.get('values');
             var disabled = this.model.get('disabled');
             for (var index in items) {
                 var item_query = ' :contains("' + items[index] + '")';
                 if (this.$buttongroup.find(item_query).length === 0) {
                     $('<button />')
                         .attr('type', 'button')
                         .addClass('btn')
                         .html(items[index])
                         .appendTo(this.$buttongroup)
                         .on('click', $.proxy(this.handle_click, this));
                 }
                 
                 var $item_element = this.$buttongroup.find(item_query);
                 if (this.model.get('value') == items[index]) {
                     $item_element.addClass('active');
                 } else {
                     $item_element.removeClass('active');
                 }
                 $item_element.prop('disabled', disabled);
             }
             
             // Remove items that no longer exist.
             this.$buttongroup.find('button').each(function(i, obj) {
                 var value = $(obj).html();
                 var found = false;
                 for (var index in items) {
                     if (items[index] == value) {
                         found = true;
                         break;
                     }
                 }
                 
                 if (!found) {
                     $(obj).remove();
                 }
             });
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
 
         // Handle when a value is clicked.
         handle_click: function (e) {
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', $(e.target).html(), this);
+            this.model.set('value', $(e.target).html(), {updated_view: this});
             this.touch();
         },
         
     });
 
     widget_manager.register_widget_view('ToggleButtonsView', ToggleButtonsView);
 
     var ListBoxView = IPython.DOMWidgetView.extend({
         
         // Called when view is rendered.
         render : function(){
             this.$el
                 .addClass('widget-hbox')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$listbox = $('<select />')
                 .addClass('widget-listbox')
                 .attr('size', 6)
                 .appendTo(this.$el);
             this.$el_to_style = this.$listbox; // Set default element to style
             this.update();
         },
         
-        update : function(){
+        update : function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            
+            if (options === undefined || options.updated_view != this) {
             // Add missing items to the DOM.
             var items = this.model.get('values');
             for (var index in items) {
                 var item_query = ' :contains("' + items[index] + '")';
                 if (this.$listbox.find(item_query).length === 0) {
                     $('<option />')
                         .html(items[index])
                         .attr('value', items[index])
                         .appendTo(this.$listbox)
                         .on('click', $.proxy(this.handle_click, this));
                 }
             }
 
             // Select the correct element
             this.$listbox.val(this.model.get('value'));
             
             // Disable listbox if needed
             var disabled = this.model.get('disabled');
             this.$listbox.prop('disabled', disabled);
 
             // Remove items that no longer exist.
             this.$listbox.find('option').each(function(i, obj) {
                 var value = $(obj).html();
                 var found = false;
                 for (var index in items) {
                     if (items[index] == value) {
                         found = true;
                         break;
                     }
                 }
                 
                 if (!found) {
                     $(obj).remove();
                 }
             });
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
 
         // Handle when a value is clicked.
         handle_click: function (e) {
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', $(e.target).html(), this);
+            this.model.set('value', $(e.target).html(), {updated_view: this});
             this.touch();
         },
         
     });
 
     widget_manager.register_widget_view('ListBoxView', ListBoxView);
 });

IPython/html/static/notebook/js/widgets/widget_string.js

@@ -1,202 +1,202 b''
 //----------------------------------------------------------------------------
 //  Copyright (C) 2013 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
 //----------------------------------------------------------------------------
 
 //============================================================================
 // StringWidget
 //============================================================================
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
 define(["notebook/js/widgets/widget"], function(widget_manager){
     var StringWidgetModel = IPython.WidgetModel.extend({});
     widget_manager.register_widget_model('StringWidgetModel', StringWidgetModel);
 
     var HTMLView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render : function(){
             this.update(); // Set defaults.
         },
         
         update : function(){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
             this.$el.html(this.model.get('value'));
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
     });
 
     widget_manager.register_widget_view('HTMLView', HTMLView);
 
 
     var LatexView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render : function(){
             this.update(); // Set defaults.
         },
         
         update : function(){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
             this.$el.html(this.model.get('value'));
             MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$el.get(0)]);
 
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
     });
 
     widget_manager.register_widget_view('LatexView', LatexView);
 
     var TextAreaView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render: function(){
             this.$el
                 .addClass('widget-hbox')
                 .html('');
             this.$label = $('<div />')
                 .appendTo(this.$el)
                 .addClass('widget-hlabel')
                 .hide();
             this.$textbox = $('<textarea />')
                 .attr('rows', 5)
                 .addClass('widget-text')
                 .appendTo(this.$el);
             this.$el_to_style = this.$textbox; // Set default element to style
             this.update(); // Set defaults.
 
             this.model.on('msg:custom', $.proxy(this._handle_textarea_msg, this));
         },
 
 
         _handle_textarea_msg: function (content){
             if (content.method == "scroll_to_bottom") {
                 this.scroll_to_bottom();                
             }
         },
 
 
         scroll_to_bottom: function (){
             this.$textbox.scrollTop(this.$textbox[0].scrollHeight);
         },
 
         
-        update: function(){
+        update: function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
-            if (!this.user_invoked_update) {
+            if (options === undefined || options.updated_view != this) {
                 this.$textbox.val(this.model.get('value'));
-            }
 
             var disabled = this.model.get('disabled');
             this.$textbox.prop('disabled', disabled);
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         events: {"keyup textarea": "handleChanging",
                 "paste textarea": "handleChanging",
                 "cut textarea": "handleChanging"},
         
         // Handles and validates user input.
         handleChanging: function(e) { 
-            this.user_invoked_update = true;
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', e.target.value);
+            this.model.set('value', e.target.value, {updated_view: this});
             this.touch();
-            this.user_invoked_update = false;
         },
     });
 
     widget_manager.register_widget_view('TextAreaView', TextAreaView);
 
     var TextBoxView = IPython.DOMWidgetView.extend({
       
         // Called when view is rendered.
         render: function(){
             this.$el
                 .addClass('widget-hbox-single')
                 .html('');
             this.$label = $('<div />')
                 .addClass('widget-hlabel')
                 .appendTo(this.$el)
                 .hide();
             this.$textbox = $('<input type="text" />')
                 .addClass('input')
                 .addClass('widget-text')
                 .appendTo(this.$el);
             this.$el_to_style = this.$textbox; // Set default element to style
             this.update(); // Set defaults.
         },
         
-        update: function(){
+        update: function(options){
             // Update the contents of this view
             //
             // Called when the model is changed.  The model may have been 
             // changed by another view or by a state update from the back-end.
+            if (options === undefined || options.updated_view != this) {
             if (this.$textbox.val() != this.model.get('value')) {
                 this.$textbox.val(this.model.get('value'));
             }
 
             var disabled = this.model.get('disabled');
             this.$textbox.prop('disabled', disabled);
 
             var description = this.model.get('description');
             if (description.length === 0) {
                 this.$label.hide();
             } else {
                 this.$label.html(description);
                 this.$label.show();
             }
+            }
             return IPython.DOMWidgetView.prototype.update.call(this);
         },
         
         events: {"keyup input": "handleChanging",
                 "paste input": "handleChanging",
                 "cut input": "handleChanging",
                 "keypress input": "handleKeypress"},
         
         // Handles and validates user input.
         handleChanging: function(e) { 
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value', e.target.value);
+            this.model.set('value', e.target.value, {updated_view: this});
             this.touch();
         },
         
         // Handles text submition
         handleKeypress: function(e) { 
             if (e.keyCode == 13) { // Return key
                 this.send({event: 'submit'});
             }
         },
     });
 
     widget_manager.register_widget_view('TextBoxView', TextBoxView);
 });