Bump version to 1.1.4.

recurser · May 30, 2013 · 0375097 · 0375097
1 parent 39d7a3a
commit 0375097
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/README.markdown b/README.markdown
@@ -170,6 +170,7 @@ Total time: 2 seconds
 Change history
 -----------
 
+* **Version 1.1.4 (2013-05-30)** : Add support for jQuery 1.9.1 (thanks [napcs](https://github.com/napcs)).
 * **Version 1.1.3 (2013-04-07)** : Rename *callback* option to *onSelect*.
 * **Version 1.1.2 (2013-04-06)** : Add *onCellEnter*, *onClose* and *livePreview* options (thanks [jbergen](https://github.com/jbergen)).
 * **Version 1.1.1 (2013-03-29)** : Add *callback* option (thanks [jbergen](https://github.com/jbergen)).

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.3
+1.1.4
diff --git a/jquery.simple-color.js b/jquery.simple-color.js
@@ -7,7 +7,7 @@
  * Licensed under the MIT license:
  *   http://www.opensource.org/licenses/mit-license.php
  *
- * Version: 1.1.3 (201304080141)
+ * Version: 1.1.4 (201305301304)
  */
  (function($) {
 /**
@@ -129,10 +129,13 @@
 
     // Figure out the cell dimensions
     options.totalWidth = options.columns * (options.cellWidth + (2 * options.cellMargin));
-    if ($.browser.msie) {
+
+    // this should probably do feature detection - I don't know why we need +2 for IE
+    // but this works for jQuery 1.9.1
+    if (navigator.userAgent.indexOf("MSIE")!=-1){
       options.totalWidth += 2;
     }
-
+    
     options.totalHeight = Math.ceil(options.colors.length / options.columns) * (options.cellHeight + (2 * options.cellMargin));
 
     // Store these options so they'll be available to the other functions

diff --git a/jquery.simple-color.min.js b/jquery.simple-color.min.js