Add parsing of non-json strings with options

TITAN-UZ · Jul 28, 2014 · 7704731 · 7704731
1 parent d76f925
commit 7704731
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 0 deletions.
diff --git a/src/jquery.remodal.js b/src/jquery.remodal.js
@@ -90,6 +90,40 @@
         $("html, body").removeClass(pluginName + "_lock");
     };
 
+    /**
+     * Parse string with options
+     * @param str
+     * @returns {Object}
+     */
+    var parseOptions = function (str) {
+        var obj = {}, clearedStr, arr;
+
+        // remove spaces before and after delimiters
+        clearedStr = str.replace(/\s*:\s*/g, ":").replace(/\s*,\s*/g, ",");
+
+        // parse string
+        arr = clearedStr.split(",");
+        var i, len, val;
+        for (i = 0, len = arr.length; i < len; i++) {
+            arr[i] = arr[i].split(":");
+            val = arr[i][1];
+
+            // convert string value if it is like a boolean
+            if (typeof val === "string" || val instanceof String) {
+                val = val === "true" || (val === "false" ? false : val);
+            }
+
+            // convert string value if it is like a number
+            if (typeof val === "string" || val instanceof String) {
+                val = !isNaN(val) ? +val : val;
+            }
+
+            obj[arr[i][0]] = val;
+        }
+
+        return obj;
+    };
+
     /**
      * Remodal constructor
      */
@@ -286,6 +320,8 @@
 
             if (!options) {
                 options = {};
+            } else if (typeof options == "string" || options instanceof String) {
+                options = parseOptions(options);
             }
 
             $container[pluginName](options);

diff --git a/test/remodal.html b/test/remodal.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Vide Test Suite</title>
+    <!-- Load local jQuery. This can be overridden with a ?jquery=___ param. -->
+    <script src="../libs/jquery-loader.js"></script>
+    <!-- Load local QUnit. -->
+    <link rel="stylesheet" href="../libs/qunit/qunit.css" media="screen">
+    <script src="../libs/qunit/qunit.js"></script>
+    <!-- Load local lib and tests. -->
+    <script src="../src/jquery.remodal.js"></script>
+    <script src="remodal_test.js"></script>
+    <script>window._$ = jQuery.noConflict(true);</script>
+</head>
+<body>
+<div id="qunit"></div>
+<div id="qunit-fixture"></div>
+</body>
+</html>
diff --git a/test/remodal_test.js b/test/remodal_test.js
@@ -0,0 +1,23 @@
+(function ($) {
+    /*
+     ======== A Handy Little QUnit Reference ========
+     http://api.qunitjs.com/
+
+     Test methods:
+     module(name, {[setup][ ,teardown]})
+     test(name, callback)
+     expect(numberOfAssertions)
+     stop(increment)
+     start(decrement)
+     Test assertions:
+     ok(value, [message])
+     equal(actual, expected, [message])
+     notEqual(actual, expected, [message])
+     deepEqual(actual, expected, [message])
+     notDeepEqual(actual, expected, [message])
+     strictEqual(actual, expected, [message])
+     notStrictEqual(actual, expected, [message])
+     throws(block, [expected], [message])
+     */
+
+}(jQuery));