Changeset 30941 for trunk/plugins/TakeATour/js/custom.patch

Timestamp:

Feb 10, 2015, 2:49:36 PM (9 years ago)

Author:

plg

Message:

bug 3198: upgrade Bootstrap tour to version 0.10.1 + change patch to replace toString.call by {}.toString.call (compatibility with IE)

File:

• trunk/plugins/TakeATour/js/custom.patch (modified) (2 diffs)

trunk/plugins/TakeATour/js/custom.patch

@@ -1 @@
---- E:/Program Files/EasyPHP/www/SITE/sandbox/pwg_test/piwigo_trunk/plugins/TakeATour/js/903.js Mon Jun 23 21:44:59 2014
-+++ E:/Program Files/EasyPHP/www/SITE/sandbox/pwg_test/piwigo_trunk/plugins/TakeATour/js/custom-bootstrap-tour-standalone.js    Sun Apr 13 19:05:42 2014
-@@ -849,9 +849,15 @@
+--- bootstrap-tour-standalone.js.orig   2015-02-10 14:28:55.000000000 +0100
++++ bootstrap-tour-standalone.js        2015-02-10 14:35:03.000000000 +0100
+@@ -870,9 +870,15 @@
                  return step.path;
              }
            }).call(_this);
--          current_path = [document.location.pathname, document.location.hash].join("");
-+        current_path = document.location.href;
+-          current_path = [document.location.pathname, document.location.hash].join('');
++          current_path = document.location.href;
            if (_this._isRedirect(path, current_path)) {
-+          if (toString.call(path) === "[object RegExp]") {
-             _this._redirect(step, path);
++            if ({}.toString.call(path) === "[object RegExp]") {
++             _this._redirect(step, path);
 +          }
 +          else {
 +            path = document.location.protocol+'//'+path;
-+            _this._redirect(step, path);
+             _this._redirect(step, path);
 +          }
              return;
            }
            if (_this._isOrphan(step)) {
-@@ -866,6 +872,14 @@
+@@ -887,6 +893,14 @@
              }
              _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true.");
@@ -33 +33 @@
              _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0);
            }
-@@ -988,7 +1002,7 @@
+@@ -1023,7 +1037,7 @@
      };
  
      Tour.prototype._isRedirect = function(path, currentPath) {
--      return (path != null) && path !== "" && (({}.toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || ({}.toString.call(path) === "[object String]" && path.replace(/\?.*$/, "").replace(/\/?$/, "") !== currentPath.replace(/\/?$/, "")));
-+      return (path != null) && path !== "" && ((toString.call(path) === "[object RegExp]" && !path.test(currentPath)) || (toString.call(path) === "[object String]" && path !== currentPath.replace("http://", "").replace("https://", "")));
+-      return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path.replace(/\?.*$/, '').replace(/\/?$/, '') !== currentPath.replace(/\/?$/, '')));
++      return (path != null) && path !== '' && (({}.toString.call(path) === '[object RegExp]' && !path.test(currentPath)) || ({}.toString.call(path) === '[object String]' && path !== currentPath.replace("http://", "").replace("https://", "")));
      };