spectrum 1.8.0

Author: bdukes

spectrum_1.7.1/CHANGES.htm spectrum_1.8.0/CHANGES.htmspectrum_1.7.1/CHANGES.htm renamed to spectrum_1.8.0/CHANGES.htm

@@ -1 +1 @@
-<p>spectrum is licened under the <a href="https://github.com/bgrins/spectrum/blob/1.7.1/LICENSE">MIT License</a>.</p>
+<p>spectrum is licened under the <a href="https://github.com/bgrins/spectrum/blob/1.8.0/LICENSE">MIT License</a>.</p>

spectrum_1.7.1/LICENSE.htm spectrum_1.8.0/LICENSE.htmspectrum_1.7.1/LICENSE.htm renamed to spectrum_1.8.0/LICENSE.htm

@@ -1,5 +1,5 @@
 /***
-Spectrum Colorpicker v1.7.1
+Spectrum Colorpicker v1.8.0
 https://github.com/bgrins/spectrum
 Author: Brian Grinstead
 License: MIT

spectrum_1.7.1/spectrum.css spectrum_1.8.0/spectrum.cssspectrum_1.7.1/spectrum.css renamed to spectrum_1.8.0/spectrum.css

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="spectrum" type="JavaScript_Library" version="1.7.1">
+    <package name="spectrum" type="JavaScript_Library" version="1.8.0">
       <friendlyName>Spectrum</friendlyName>
       <description>The No Hassle JavaScript Colorpicker</description>
       <owner>
@@ -21,7 +21,7 @@
             <libraryName>spectrum</libraryName>
             <fileName>spectrum.js</fileName>
             <preferredScriptLocation>BodyBottom</preferredScriptLocation>
-            <CDNPath>https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.7.1/spectrum.min.js</CDNPath>
+            <CDNPath>https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.min.js</CDNPath>
             <objectName>jQuery.fn.spectrum</objectName>
           </javaScriptLibrary>
         </component>

spectrum_1.7.1/spectrum.dnn spectrum_1.8.0/spectrum.dnnspectrum_1.7.1/spectrum.dnn renamed to spectrum_1.8.0/spectrum.dnn

@@ -1,4 +1,4 @@
-// Spectrum Colorpicker v1.7.1
+// Spectrum Colorpicker v1.8.0
 // https://github.com/bgrins/spectrum
 // Author: Brian Grinstead
 // License: MIT
@@ -10,7 +10,7 @@
         define(['jquery'], factory);
     }
     else if (typeof exports == "object" && typeof module == "object") { // CommonJS
-        module.exports = factory;
+        module.exports = factory(require('jquery'));
     }
     else { // Browser
         factory(jQuery);
@@ -234,8 +234,7 @@
             previewElement = replacer.find(".sp-preview-inner"),
             initialColor = opts.color || (isInput && boundElement.val()),
             colorOnShow = false,
-            preferredFormat = opts.preferredFormat,
-            currentPreferredFormat = preferredFormat,
+            currentPreferredFormat = opts.preferredFormat,
             clickoutFiresChange = !opts.showButtons || opts.clickoutFiresChange,
             isEmpty = !initialColor,
             allowEmpty = opts.allowEmpty && !isInputTypeColor;
@@ -443,7 +442,7 @@
                 // In case color was black - update the preview UI and set the format
                 // since the set function will not run (default color is black).
                 updateUI();
-                currentPreferredFormat = preferredFormat || tinycolor(initialColor).format;
+                currentPreferredFormat = opts.preferredFormat || tinycolor(initialColor).format;
 
                 addColorToSelectionPalette(initialColor);
             }
@@ -705,7 +704,7 @@
             updateUI();
 
             if (newColor && newColor.isValid() && !ignoreFormatChange) {
-                currentPreferredFormat = preferredFormat || newColor.getFormat();
+                currentPreferredFormat = opts.preferredFormat || newColor.getFormat();
             }
         }
 
@@ -878,6 +877,9 @@
         }
 
         function reflow() {
+            if (!visible) {
+                return; // Calculations would be useless and wouldn't be reliable anyways
+            }
             dragWidth = dragger.width();
             dragHeight = dragger.height();
             dragHelperHeight = dragHelper.height();
@@ -922,6 +924,10 @@
             }
 
             opts[optionName] = optionValue;
+
+            if (optionName === "preferredFormat") {
+                currentPreferredFormat = opts.preferredFormat;
+            }
             applyOptions();
         }