Merge branch 'master' of https://code.fineres.com/scm/~roy.liu/fineui

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-22 11:30:20 */
+/*! time: 2020-12-23 13:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -86651,7 +86651,15 @@ _.extend(BI, {
             return _.map(params, function (param, i) {
                 // Don't decode the search params.
                 if (i === params.length - 1) return param || null;
-                return param ? decodeURIComponent(param) : null;
+                var resultParam = null;
+                if (param) {
+                    try {
+                        resultParam = decodeURIComponent(param);
+                    } catch (e) {
+                        resultParam = param;
+                    }
+                }
+                return resultParam;
             });
         }
 
@@ -86717,7 +86725,11 @@ _.extend(BI, {
 
         // Get the pathname and search params, without the root.
         getPath: function () {
-            var path = decodeURI(this.location.pathname + this.getSearch());
+            var path = this.location.pathname + this.getSearch();
+            try {
+                path = decodeURI(path);
+            } catch(e) {
+            }
             var root = this.root.slice(0, -1);
             if (!path.indexOf(root)) path = path.slice(root.length);
             return path.charAt(0) === "/" ? path.slice(1) : path;
@@ -86905,7 +86917,11 @@ _.extend(BI, {
             var url = root + fragment;
 
             // Strip the hash and decode for matching.
-            fragment = decodeURI(fragment.replace(pathStripper, ""));
+            fragment = fragment.replace(pathStripper, "")
+            try {
+                fragment = decodeURI(fragment);
+            } catch(e) {
+            }
 
             if (this.fragment === fragment) return;
             this.fragment = fragment;

dist/core.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-22 11:30:20 */
+/*! time: 2020-12-23 13:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -86651,7 +86651,15 @@ _.extend(BI, {
             return _.map(params, function (param, i) {
                 // Don't decode the search params.
                 if (i === params.length - 1) return param || null;
-                return param ? decodeURIComponent(param) : null;
+                var resultParam = null;
+                if (param) {
+                    try {
+                        resultParam = decodeURIComponent(param);
+                    } catch (e) {
+                        resultParam = param;
+                    }
+                }
+                return resultParam;
             });
         }
 
@@ -86717,7 +86725,11 @@ _.extend(BI, {
 
         // Get the pathname and search params, without the root.
         getPath: function () {
-            var path = decodeURI(this.location.pathname + this.getSearch());
+            var path = this.location.pathname + this.getSearch();
+            try {
+                path = decodeURI(path);
+            } catch(e) {
+            }
             var root = this.root.slice(0, -1);
             if (!path.indexOf(root)) path = path.slice(root.length);
             return path.charAt(0) === "/" ? path.slice(1) : path;
@@ -86905,7 +86917,11 @@ _.extend(BI, {
             var url = root + fragment;
 
             // Strip the hash and decode for matching.
-            fragment = decodeURI(fragment.replace(pathStripper, ""));
+            fragment = fragment.replace(pathStripper, "")
+            try {
+                fragment = decodeURI(fragment);
+            } catch(e) {
+            }
 
             if (this.fragment === fragment) return;
             this.fragment = fragment;

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-22 11:30:20 */
+/*! time: 2020-12-23 13:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -86651,7 +86651,15 @@ _.extend(BI, {
             return _.map(params, function (param, i) {
                 // Don't decode the search params.
                 if (i === params.length - 1) return param || null;
-                return param ? decodeURIComponent(param) : null;
+                var resultParam = null;
+                if (param) {
+                    try {
+                        resultParam = decodeURIComponent(param);
+                    } catch (e) {
+                        resultParam = param;
+                    }
+                }
+                return resultParam;
             });
         }
 
@@ -86717,7 +86725,11 @@ _.extend(BI, {
 
         // Get the pathname and search params, without the root.
         getPath: function () {
-            var path = decodeURI(this.location.pathname + this.getSearch());
+            var path = this.location.pathname + this.getSearch();
+            try {
+                path = decodeURI(path);
+            } catch(e) {
+            }
             var root = this.root.slice(0, -1);
             if (!path.indexOf(root)) path = path.slice(root.length);
             return path.charAt(0) === "/" ? path.slice(1) : path;
@@ -86905,7 +86917,11 @@ _.extend(BI, {
             var url = root + fragment;
 
             // Strip the hash and decode for matching.
-            fragment = decodeURI(fragment.replace(pathStripper, ""));
+            fragment = fragment.replace(pathStripper, "")
+            try {
+                fragment = decodeURI(fragment);
+            } catch(e) {
+            }
 
             if (this.fragment === fragment) return;
             this.fragment = fragment;

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-22 11:30:20 */
+/*! time: 2020-12-23 13:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -86651,7 +86651,15 @@ _.extend(BI, {
             return _.map(params, function (param, i) {
                 // Don't decode the search params.
                 if (i === params.length - 1) return param || null;
-                return param ? decodeURIComponent(param) : null;
+                var resultParam = null;
+                if (param) {
+                    try {
+                        resultParam = decodeURIComponent(param);
+                    } catch (e) {
+                        resultParam = param;
+                    }
+                }
+                return resultParam;
             });
         }
 
@@ -86717,7 +86725,11 @@ _.extend(BI, {
 
         // Get the pathname and search params, without the root.
         getPath: function () {
-            var path = decodeURI(this.location.pathname + this.getSearch());
+            var path = this.location.pathname + this.getSearch();
+            try {
+                path = decodeURI(path);
+            } catch(e) {
+            }
             var root = this.root.slice(0, -1);
             if (!path.indexOf(root)) path = path.slice(root.length);
             return path.charAt(0) === "/" ? path.slice(1) : path;
@@ -86905,7 +86917,11 @@ _.extend(BI, {
             var url = root + fragment;
 
             // Strip the hash and decode for matching.
-            fragment = decodeURI(fragment.replace(pathStripper, ""));
+            fragment = fragment.replace(pathStripper, "")
+            try {
+                fragment = decodeURI(fragment);
+            } catch(e) {
+            }
 
             if (this.fragment === fragment) return;
             this.fragment = fragment;

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-22 11:30:20 */
+/*! time: 2020-12-23 13:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-22 11:30:20 */
+/*! time: 2020-12-23 13:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20201222113229",
+  "version": "2.0.20201223135207",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

src/router/router.js

@@ -298,7 +298,15 @@
             return _.map(params, function (param, i) {
                 // Don't decode the search params.
                 if (i === params.length - 1) return param || null;
-                return param ? decodeURIComponent(param) : null;
+                var resultParam = null;
+                if (param) {
+                    try {
+                        resultParam = decodeURIComponent(param);
+                    } catch (e) {
+                        resultParam = param;
+                    }
+                }
+                return resultParam;
             });
         }
 
@@ -364,7 +372,11 @@
 
         // Get the pathname and search params, without the root.
         getPath: function () {
-            var path = decodeURI(this.location.pathname + this.getSearch());
+            var path = this.location.pathname + this.getSearch();
+            try {
+                path = decodeURI(path);
+            } catch(e) {
+            }
             var root = this.root.slice(0, -1);
             if (!path.indexOf(root)) path = path.slice(root.length);
             return path.charAt(0) === "/" ? path.slice(1) : path;
@@ -552,7 +564,11 @@
             var url = root + fragment;
 
             // Strip the hash and decode for matching.
-            fragment = decodeURI(fragment.replace(pathStripper, ""));
+            fragment = fragment.replace(pathStripper, "")
+            try {
+                fragment = decodeURI(fragment);
+            } catch(e) {
+            }
 
             if (this.fragment === fragment) return;
             this.fragment = fragment;