upstream/ipython Commit - r14663:77e364df

Replace .html with .text everywhere possible

Jonathan Frederic -

r14663:77e364df

parent child

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

0 +3 -3

                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                              var description = this.model.get('description');
                              if (description.length === 0) {
-                                 this.$el.html(' '); // Preserve button height
+                                 this.$el.text(' '); // Preserve button height
                              } else {
-                                 this.$el.html(description);
+                                 this.$el.text(description);
                              }
                          }
                          return ToggleButtonView.__super__.update.apply(this);

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

0 +2 -4

                          // 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 description = this.model.get('description');
-                         description = description.replace(/ /g, '&nbsp;', 'm');
-                         description = description.replace(/\n/g, '<br>\n', 'm');
                          if (description.length === 0) {
-                             this.$el.html('&nbsp;'); // Preserve button height
+                             this.$el.text(' '); // Preserve button height
                          } else {
-                             this.$el.html(description);
+                             this.$el.text(description);
                          }
                          if (this.model.get('disabled')) {

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

0 +6 -11

                          }, this);
                          this.$el
-                             .html('')
                              .on("remove", function(){
                                  that.$window.remove();
                              });
                              });
                          this.$title = $('<div />')
                              .addClass('widget-modal-title')
-                             .html('&nbsp;')
+                             .text(' ')
                              .appendTo(this.$title_bar);
                          this.$body = $('<div />')
                              .addClass('modal-body')
                              .appendTo(this.$window);
                          this.$show_button = $('<button />')
-                             .html('&nbsp;')
+                             .text(' ')
                              .addClass('btn btn-info widget-modal-show')
                              .appendTo(this.$el)
                              .click(function(){
                          // 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 description = this.model.get('description');
-                         description = description.replace(/ /g, '&nbsp;', 'm');
-                         description = description.replace(/\n/g, '<br>\n', 'm');
                          if (description.length === 0) {
-                             this.$title.html('&nbsp;'); // Preserve title height
+                             this.$title.text(' '); // Preserve title height
                          } else {
-                             this.$title.html(description);
+                             this.$title.text(description);
                          }
                          var button_text = this.model.get('button_text');
-                         button_text = button_text.replace(/ /g, '&nbsp;', 'm');
-                         button_text = button_text.replace(/\n/g, '<br>\n', 'm');
                          if (button_text.length === 0) {
-                             this.$show_button.html('&nbsp;'); // Preserve button height
+                             this.$show_button.text(' '); // Preserve button height
                          } else {
-                             this.$show_button.html(button_text);
+                             this.$show_button.text(button_text);
                          }
                          if (!this._shown_once) {

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

0 +3 -3

                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                          if (description.length === 0) {
                              this.$label.hide();
                          } else {
-                             this.$label.html(description);
+                             this.$label.text(description);
                              this.$label.show();
                          }
                          return ProgressView.__super__.update.apply(this);

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

0 +2 -2

                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }

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

0 +18 -21

                      render : function(){
                          // Called when view is rendered.
                          this.$el
-                             .addClass('widget-hbox-single')
-                             .html('');
+                             .addClass('widget-hbox-single');
                          this.$label = $('<div />')
                              .appendTo(this.$el)
                              .addClass('widget-hlabel')
                          this.$droplabel = $('<button />')
                              .addClass('btn')
                              .addClass('widget-combo-btn')
-                             .html('&nbsp;')
+                             .text(' ')
                              .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>')
+                             .append($('<span />').addClass("caret"))
                              .appendTo(this.$buttongroup);
                          this.$droplist = $('<ul />')
                              .addClass('dropdown-menu')
                          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;');
+                                 this.$droplabel.text(' ');
                              } else {
-                                 this.$droplabel.html(selected_item_text);
+                                 this.$droplabel.text(selected_item_text);
                              }
                              var items = this.model.get('values');
                              for (var index in items) {
                                  var that = this;
                                  var item_button = $('<a href="#"/>')
-                                     .html(items[index])
+                                     .text(items[index])
                                      .on('click', $.proxy(this.handle_click, this));
                                  $replace_droplist.append($('<li />').append(item_button));
                              }
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                          // Calling model.set will trigger all of the other views of the
                          // model to update.
-                         this.model.set('value', $(e.target).html(), {updated_view: this});
+                         this.model.set('value', $(e.target).text(), {updated_view: this});
                          this.touch();
                      },
                                  if (this.$el.find(item_query).length === 0) {
                                      var $label = $('<label />')
                                          .addClass('radio')
-                                         .html(items[index])
+                                         .text(items[index])
                                          .appendTo(this.$container);
                                      $('<input />')
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                                      $('<button />')
                                          .attr('type', 'button')
                                          .addClass('btn')
-                                         .html(items[index])
+                                         .text(items[index])
                                          .appendTo(this.$buttongroup)
                                          .on('click', $.proxy(this.handle_click, this));
                                  }
                              // Remove items that no longer exist.
                              this.$buttongroup.find('button').each(function(i, obj) {
-                                 var value = $(obj).html();
+                                 var value = $(obj).text();
                                  var found = false;
                                  for (var index in items) {
                                      if (items[index] == value) {
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                          // Calling model.set will trigger all of the other views of the
                          // model to update.
-                         this.model.set('value', $(e.target).html(), {updated_view: this});
+                         this.model.set('value', $(e.target).text(), {updated_view: this});
                          this.touch();
                      },
                  });
                                  var item_query = ' :contains("' + items[index] + '")';
                                  if (this.$listbox.find(item_query).length === 0) {
                                      $('<option />')
-                                         .html(items[index])
+                                         .text(items[index])
                                          .attr('value', items[index])
                                          .appendTo(this.$listbox)
                                          .on('click', $.proxy(this.handle_click, this));
                              // Remove items that no longer exist.
                              this.$listbox.find('option').each(function(i, obj) {
-                                 var value = $(obj).html();
+                                 var value = $(obj).text();
                                  var found = false;
                                  for (var index in items) {
                                      if (items[index] == value) {
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                          // Calling model.set will trigger all of the other views of the
                          // model to update.
-                         this.model.set('value', $(e.target).html(), {updated_view: this});
+                         this.model.set('value', $(e.target).text(), {updated_view: this});
                          this.touch();
                      },
                  });

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

0 +4 -4

                                      accordian
                                          .find('.accordion-heading')
                                          .find('.accordion-toggle')
-                                         .html(titles[page_index]);
+                                         .text(titles[page_index]);
                                  }
                              }
                                  that.model.set("selected_index", index, {updated_view: this});
                                  that.touch();
                               })
-                             .html('Page ' + index)
+                             .text('Page ' + index)
                              .appendTo(accordion_heading);
                          var accordion_body = $('<div />', {id: uuid})
                              .addClass('accordion-body collapse')
                          var tab_text = $('<a />')
                              .attr('href', '#' + uuid)
                              .attr('data-toggle', 'tab')
-                             .html('Page ' + index)
+                             .text('Page ' + index)
                              .appendTo(tab)
                              .click(function (e) {
                              for (var page_index in titles) {
                                  var tab_text = this.containers[page_index];
                                  if (tab_text !== undefined) {
-                                     tab_text.html(titles[page_index]);
+                                     tab_text.text(titles[page_index]);
                                  }
                              }

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

0 +6 -8

                          //
                          // 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'));
+                         this.$el.html(this.model.get('value')); // CAUTION! .html(...) CALL MANDITORY!!!
                          return HTMLView.__super__.update.apply(this);
                      },
                  });
                          //
                          // 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'));
+                         this.$el.text(this.model.get('value'));
                          MathJax.Hub.Queue(["Typeset",MathJax.Hub,this.$el.get(0)]);
                          return LatexView.__super__.update.apply(this);
                      render: function(){
                          // Called when view is rendered.
                          this.$el
-                             .addClass('widget-hbox')
-                             .html('');
+                             .addClass('widget-hbox');
                          this.$label = $('<div />')
                              .appendTo(this.$el)
                              .addClass('widget-hlabel')
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }
                      render: function(){
                          // Called when view is rendered.
                          this.$el
-                             .addClass('widget-hbox-single')
-                             .html('');
+                             .addClass('widget-hbox-single');
                          this.$label = $('<div />')
                              .addClass('widget-hlabel')
                              .appendTo(this.$el)
                              if (description.length === 0) {
                                  this.$label.hide();
                              } else {
-                                 this.$label.html(description);
+                                 this.$label.text(description);
                                  this.$label.show();
                              }
                          }

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