Fixed issue #25

rstaib · Sep 24, 2014 · 0b5b12c · 0b5b12c
1 parent 9ede612
commit 0b5b12c
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.1
+
+### Bug Fixes
+- Fixed issue [#25](http://github.com/rstaib/jquery-bootgrid/issues/25)
+
 ## 1.1.0
 
 ### Enhancements & Features

diff --git a/bootgrid.jquery.json b/bootgrid.jquery.json
@@ -14,7 +14,7 @@
         "accessibility",
         "bootstrap"
     ],
-    "version": "1.1.0",
+    "version": "1.1.1",
     "author": {
         "name": "Rafael Staib",
         "email": "me@rafaelstaib.com",

diff --git a/bower.json b/bower.json
@@ -13,7 +13,7 @@
         "accessibility",
         "bootstrap"
     ],
-    "version": "1.1.0",
+    "version": "1.1.1",
     "authors": [
         { "name": "Rafael Staib", "email": "me@rafaelstaib.com", "url": "http://www.rafaelstaib.com" }
     ],

diff --git a/build/jQuery.Bootgrid.1.1.0.nupkg b/build/jQuery.Bootgrid.1.1.0.nupkg
diff --git a/build/jQuery.Bootgrid.1.1.1.nupkg b/build/jQuery.Bootgrid.1.1.1.nupkg
diff --git a/build/jquery.bootgrid-1.1.0.zip b/build/jquery.bootgrid-1.1.0.zip
diff --git a/build/jquery.bootgrid-1.1.1.zip b/build/jquery.bootgrid-1.1.1.zip
diff --git a/build/jquery.bootgrid.js b/build/jquery.bootgrid.js
@@ -1,5 +1,5 @@
 /*! 
- * jQuery Bootgrid v1.1.0 - 09/12/2014
+ * jQuery Bootgrid v1.1.1 - 09/24/2014
  * Copyright (c) 2014 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
  */
@@ -1617,7 +1617,7 @@
                         }
                         key = (prefixes) ? prefixes.join(".") + "." + key : key;
                         var pattern = new RegExp("\\{\\{" + key + "\\}\\}", "gm");
-                        result = result.replace(pattern, value);
+                        result = result.replace(pattern, (value.replace) ? value.replace(/\$/gi, "&#36;") : value);
                     }
                 }
             });

diff --git a/build/jquery.bootgrid.min.js b/build/jquery.bootgrid.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "jquery-bootgrid",
     "namespace": "jquery.bootgrid",
     "title": "jQuery Bootgrid",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "Nice, sleek and intuitive. A grid control especially designed for bootstrap.",
     "homepage": "http://www.jquery-bootgrid.com",
     "author": {

diff --git a/src/extensions.js b/src/extensions.js
@@ -87,7 +87,7 @@ if (!String.prototype.resolve)
                     }
                     key = (prefixes) ? prefixes.join(".") + "." + key : key;
                     var pattern = new RegExp("\\{\\{" + key + "\\}\\}", "gm");
-                    result = result.replace(pattern, value);
+                    result = result.replace(pattern, (value.replace) ? value.replace(/\$/gi, "&#36;") : value);
                 }
             }
         });