Fixes #156. Bug in selectize.js

ankit · Dec 20, 2013 · 13257f4 · 13257f4
1 parent bf140bb
commit 13257f4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/stylebot/background/browseraction.js b/stylebot/background/browseraction.js
@@ -15,7 +15,7 @@ var BrowserAction = {
         port.onDisconnect.addListener(function() {
           if (activeTab) {
             chrome.tabs.sendRequest(activeTab.id, {
-              name: "resetPreview"
+              name: 'resetPreview'
             }, function(response){});
           }
         });

diff --git a/stylebot/editor/style.js b/stylebot/editor/style.js
@@ -616,9 +616,11 @@ stylebot.style = {
    * @param {String} css The CSS to apply to the page.
    */
   resetPreview: function() {
-    CSSUtils.crunchCSS(this.rules, true, true, _.bind(function(css) {
-      this.cache.$style.html(css);
-    }, this));
+    if (this.rules && this.cache.$style) {
+      CSSUtils.crunchCSS(this.rules, true, true, _.bind(function(css) {
+        this.cache.$style.html(css);
+      }, this));
+    };
 
     this.hidePreviewPopover();
   },

diff --git a/stylebot/editor/widget-ui.js b/stylebot/editor/widget-ui.js
@@ -50,7 +50,8 @@ var WidgetUI = {
   SIZE_UNITS: ['px', 'em', '%', 'pt'],
   DEFAULT_SIZE_UNIT: 'px',
 
-  DEFAULT_FONT_STACK: ['Helvetica',
+  DEFAULT_FONT_STACK: [
+    'Helvetica',
     'Roboto',
     'Lato',
     'Palatino',

diff --git a/stylebot/editor/widget.basic.js b/stylebot/editor/widget.basic.js
@@ -84,7 +84,7 @@ stylebot.widget.basic = {
       }]
     },
     {
-      name: '<u>C</u>olor & Background',
+      name: '<u>C</u>olor &amp; Background',
       controls: [{
         name: 'Color',
         id: 'color',
@@ -134,7 +134,7 @@ stylebot.widget.basic = {
       }]
     },
     {
-      name: '<u>L</u>ayout & Visibility',
+      name: '<u>L</u>ayout &amp; Visibility',
       controls: [{
         name: 'Visibility',
         id: 'display',

diff --git a/stylebot/libs/colorpicker/colorpicker.css b/stylebot/libs/colorpicker/colorpicker.css
diff --git a/stylebot/libs/selectize/selectize.js b/stylebot/libs/selectize/selectize.js
@@ -454,7 +454,7 @@
 
     $wrapper       = $('<div>').addClass(this.settings.theme).addClass(this.settings.wrapperClass);
     $control       = $('<div>').addClass(this.settings.inputClass).addClass('items').toggleClass('has-options', !$.isEmptyObject(this.options)).appendTo($wrapper);
-    $control_input = $('<input type="text">').appendTo($control);
+    $control_input = $('<input type="text" />').appendTo($control);
     $dropdown      = $('<div>').addClass(this.settings.dropdownClass).hide().appendTo($wrapper);
 
     displayMode = this.$input.css('display');