From c50096334c0807469f0d5162404ee18150d01b1d Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Wed, 12 Feb 2014 18:20:51 -0800
Subject: [PATCH 1/4] use non-breaking space for button with no description

to preserve button's size

reverses some inappropriate replacements of .html with .text.

closes #5113
---
 IPython/html/static/notebook/js/widgets/widget_bool.js    | 2 +-
 IPython/html/static/notebook/js/widgets/widget_button.js  | 2 +-
 .../html/static/notebook/js/widgets/widget_container.js   | 8 ++++----
 .../html/static/notebook/js/widgets/widget_selection.js   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/IPython/html/static/notebook/js/widgets/widget_bool.js b/IPython/html/static/notebook/js/widgets/widget_bool.js
index 22be10651..8b966d131 100644
--- a/IPython/html/static/notebook/js/widgets/widget_bool.js
+++ b/IPython/html/static/notebook/js/widgets/widget_bool.js
@@ -103,7 +103,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
 
                 var description = this.model.get('description');
                 if (description.length === 0) {
-                    this.$el.text(' '); // Preserve button height
+                    this.$el.html("&nbsp;"); // Preserve button height
                 } else {
                     this.$el.text(description);
                 }
diff --git a/IPython/html/static/notebook/js/widgets/widget_button.js b/IPython/html/static/notebook/js/widgets/widget_button.js
index a0b747ebd..eb3c317a8 100644
--- a/IPython/html/static/notebook/js/widgets/widget_button.js
+++ b/IPython/html/static/notebook/js/widgets/widget_button.js
@@ -32,7 +32,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
             // changed by another view or by a state update from the back-end.
             var description = this.model.get('description');
             if (description.length === 0) {
-                this.$el.text(' '); // Preserve button height
+                this.$el.html("&nbsp;"); // Preserve button height
             } else {
                 this.$el.text(description);
             }
diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/notebook/js/widgets/widget_container.js
index eb538c2db..76838f90f 100644
--- a/IPython/html/static/notebook/js/widgets/widget_container.js
+++ b/IPython/html/static/notebook/js/widgets/widget_container.js
@@ -137,7 +137,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) {
                 });
             this.$title = $('<div />')
                 .addClass('widget-modal-title')
-                .text(' ')
+                .html("&nbsp;")
                 .appendTo(this.$title_bar);
             this.$body = $('<div />')
                 .addClass('modal-body')
@@ -147,7 +147,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) {
                 .appendTo(this.$window);
             
             this.$show_button = $('<button />')
-                .text(' ')
+                .html("&nbsp;")
                 .addClass('btn btn-info widget-modal-show')
                 .appendTo(this.$el)
                 .click(function(){
@@ -237,14 +237,14 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) {
             // changed by another view or by a state update from the back-end.
             var description = this.model.get('description');
             if (description.length === 0) {
-                this.$title.text(' '); // Preserve title height
+                this.$title.html("&nbsp;"); // Preserve title height
             } else {
                 this.$title.text(description);
             }
             
             var button_text = this.model.get('button_text');
             if (button_text.length === 0) {
-                this.$show_button.text(' '); // Preserve button height
+                this.$show_button.html("&nbsp;"); // Preserve button height
             } else {
                 this.$show_button.text(button_text);
             }
diff --git a/IPython/html/static/notebook/js/widgets/widget_selection.js b/IPython/html/static/notebook/js/widgets/widget_selection.js
index 30c7ce426..54e787d9c 100644
--- a/IPython/html/static/notebook/js/widgets/widget_selection.js
+++ b/IPython/html/static/notebook/js/widgets/widget_selection.js
@@ -33,7 +33,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
             this.$droplabel = $('<button />')
                 .addClass('btn')
                 .addClass('widget-combo-btn')
-                .text(' ')
+                .html("&nbsp;")
                 .appendTo(this.$buttongroup);
             this.$dropbutton = $('<button />')
                 .addClass('btn')
@@ -59,7 +59,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
             if (options === undefined || options.updated_view != this) {
                 var selected_item_text = this.model.get('value_name');
                 if (selected_item_text.length === 0) {
-                    this.$droplabel.text(' ');
+                    this.$droplabel.html("&nbsp;");
                 } else {
                     this.$droplabel.text(selected_item_text);
                 }

From 0eff2bb6511caa24e8eba10b38cb3fbed317bebf Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 13 Feb 2014 09:41:26 -0800
Subject: [PATCH 2/4] handle space-only strings, not just zero-length

---
 IPython/html/static/notebook/js/widgets/widget_bool.js      | 4 ++--
 IPython/html/static/notebook/js/widgets/widget_container.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/IPython/html/static/notebook/js/widgets/widget_bool.js b/IPython/html/static/notebook/js/widgets/widget_bool.js
index 8b966d131..6acbe7693 100644
--- a/IPython/html/static/notebook/js/widgets/widget_bool.js
+++ b/IPython/html/static/notebook/js/widgets/widget_bool.js
@@ -56,7 +56,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
                 this.$checkbox.prop('disabled', disabled);
 
                 var description = this.model.get('description');
-                if (description.length === 0) {
+                if (description.trim().length === 0) {
                     this.$label.hide();
                 } else {
                     this.$label.text(description);
@@ -102,7 +102,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
                 this.$el.prop('disabled', disabled);
 
                 var description = this.model.get('description');
-                if (description.length === 0) {
+                if (description.trim().length === 0) {
                     this.$el.html("&nbsp;"); // Preserve button height
                 } else {
                     this.$el.text(description);
diff --git a/IPython/html/static/notebook/js/widgets/widget_container.js b/IPython/html/static/notebook/js/widgets/widget_container.js
index 76838f90f..e6d51f6a8 100644
--- a/IPython/html/static/notebook/js/widgets/widget_container.js
+++ b/IPython/html/static/notebook/js/widgets/widget_container.js
@@ -236,14 +236,14 @@ define(["notebook/js/widgets/widget"], function(WidgetManager) {
             // 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');
-            if (description.length === 0) {
+            if (description.trim().length === 0) {
                 this.$title.html("&nbsp;"); // Preserve title height
             } else {
                 this.$title.text(description);
             }
             
             var button_text = this.model.get('button_text');
-            if (button_text.length === 0) {
+            if (button_text.trim().length === 0) {
                 this.$show_button.html("&nbsp;"); // Preserve button height
             } else {
                 this.$show_button.text(button_text);

From 9c452998eaa0a16ace4bf3c508a0c0e74d855bf7 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 13 Feb 2014 09:53:44 -0800
Subject: [PATCH 3/4] add utils.escape_html

---
 IPython/html/static/base/js/utils.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/IPython/html/static/base/js/utils.js b/IPython/html/static/base/js/utils.js
index c110eccab..6a1433c10 100644
--- a/IPython/html/static/base/js/utils.js
+++ b/IPython/html/static/base/js/utils.js
@@ -460,6 +460,12 @@ IPython.utils = (function (IPython) {
     };
 
 
+    var escape_html = function (text) {
+        // escape text to HTML
+        return $("<div/>").text(text).html();
+    }
+
+
     var get_body_data = function(key) {
         // get a url-encoded item from body.data and decode it
         // we should never have any encoded URLs anywhere else in code
@@ -536,6 +542,7 @@ IPython.utils = (function (IPython) {
         url_join_encode : url_join_encode,
         encode_uri_components : encode_uri_components,
         splitext : splitext,
+        escape_html : escape_html,
         always_new : always_new,
         browser : browser,
         platform: platform,

From 59d3a8ff5fee053d96f5124b3268b3b82d6ae0b9 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 13 Feb 2014 09:54:12 -0800
Subject: [PATCH 4/4] handle empty string in ToggleButtonsWidget

---
 .../notebook/js/widgets/widget_selection.js   | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/IPython/html/static/notebook/js/widgets/widget_selection.js b/IPython/html/static/notebook/js/widgets/widget_selection.js
index 54e787d9c..bdca009b1 100644
--- a/IPython/html/static/notebook/js/widgets/widget_selection.js
+++ b/IPython/html/static/notebook/js/widgets/widget_selection.js
@@ -58,7 +58,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
 
             if (options === undefined || options.updated_view != this) {
                 var selected_item_text = this.model.get('value_name');
-                if (selected_item_text.length === 0) {
+                if (selected_item_text.trim().length === 0) {
                     this.$droplabel.html("&nbsp;");
                 } else {
                     this.$droplabel.text(selected_item_text);
@@ -233,18 +233,24 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
                 var items = this.model.get('value_names');
                 var disabled = this.model.get('disabled');
                 var that = this;
+                var item_html;
                 _.each(items, function(item, index) {
-                   var item_query = ' :contains("' + item + '")';
-                    if (that.$buttongroup.find(item_query).length === 0) {
-                        $('<button />')
+                    if (item.trim().length == 0) {
+                        item_html = "&nbsp;";
+                    } else {
+                        item_html = IPython.utils.escape_html(item);
+                    }
+                    var item_query = '[data-value="' + item + '"]';
+                    var $item_element = that.$buttongroup.find(item_query);
+                    if (!$item_element.length) {
+                        $item_element = $('<button/>')
                             .attr('type', 'button')
                             .addClass('btn')
-                            .text(item)
+                            .html(item_html)
                             .appendTo(that.$buttongroup)
+                            .attr('data-value', item)
                             .on('click', $.proxy(that.handle_click, that));
                     }
-                    
-                    var $item_element = that.$buttongroup.find(item_query);
                     if (that.model.get('value_name') == item) {
                         $item_element.addClass('active');
                     } else {
@@ -255,7 +261,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
                 
                 // Remove items that no longer exist.
                 this.$buttongroup.find('button').each(function(i, obj) {
-                    var value = $(obj).text();
+                    var value = $(obj).data('value');
                     var found = false;
                     _.each(items, function(item, index) {
                         if (item == value) {
@@ -285,7 +291,7 @@ define(["notebook/js/widgets/widget"], function(WidgetManager){
             
             // Calling model.set will trigger all of the other views of the 
             // model to update.
-            this.model.set('value_name', $(e.target).text(), {updated_view: this});
+            this.model.set('value_name', $(e.target).data('value'), {updated_view: this});
             this.touch();
         },    
     });