From ba5fcfda0f1cb21d84c1f6d1ca3b92a4502eb014 Mon Sep 17 00:00:00 2001 From: flop25 Date: Mon, 23 Jun 2014 20:08:45 +0000 Subject: adjustments for 2.7 js updated to 9.0.3 git-svn-id: http://piwigo.org/svn/trunk@28775 68402e56-0260-453c-a942-63ccdbb3a9ee --- plugins/TakeATour/js/custom.patch | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 plugins/TakeATour/js/custom.patch (limited to 'plugins/TakeATour/js/custom.patch') diff --git a/plugins/TakeATour/js/custom.patch b/plugins/TakeATour/js/custom.patch new file mode 100644 index 000000000..0ad5f0b5c --- /dev/null +++ b/plugins/TakeATour/js/custom.patch @@ -0,0 +1,43 @@ +--- 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 @@ + return step.path; + } + }).call(_this); +- 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); ++ } ++ else { ++ path = document.location.protocol+'//'+path; ++ _this._redirect(step, path); ++ } + return; + } + if (_this._isOrphan(step)) { +@@ -866,6 +872,14 @@ + } + _this._debug("Show the orphan step " + (_this._current + 1) + ". Orphans option is true."); + } ++ if (step.title === "" & step.content === "") { ++ if (skipToPrevious) { ++ _this._showPrevStep(); ++ } else { ++ _this._showNextStep(); ++ } ++ return; ++ } + if (step.backdrop) { + _this._showBackdrop(!_this._isOrphan(step) ? step.element : void 0); + } +@@ -988,7 +1002,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://", ""))); + }; + + Tour.prototype._redirect = function(step, path) { -- cgit v1.2.3