upstream/ipython Commit - r14570:4e85339b

add locks to update everywhere by using options to pass this...

Jonathan Frederic -

r14570:4e85339b

parent child

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

0 +6 -10

                         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.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.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 {
                     // 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;
                     },
                 });

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

0 +9 -7

                         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) {
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },
                 });
                         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);
                             }
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                             // 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;
                             }
                         }
                     },

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

0 +9 -9

                         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) {
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },
                 });
                         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);
                             }
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                             // 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;
                             }
                         }
                     },

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

0 +8 -7

                     },
-                    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) {
                                 }
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                                 // 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)
                         }, 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) {
                             if (0 <= selected_index && selected_index < this.containers.length) {
                                 this.select_page(selected_index);
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                                 // 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);
                             });

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

0 +16 -11

                         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');
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },
                         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');
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },
                 });
                         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');
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },
                         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) {
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },

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

0 +8 -8

                     },
-                    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);
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                     // 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;
                     },
                 });
                         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'));
                             }
                                 this.$label.html(description);
                                 this.$label.show();
                             }
+                        }
                         return IPython.DOMWidgetView.prototype.update.call(this);
                     },
                         // 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();
                     },

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages