adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-10 10:42:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@30941 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2015-02-10 13:49:36 +00:00
parent a3c9137789
commit 483dc8c065
3 changed files with 1871 additions and 1395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/TakeATour/js/custom.patch
+43 -43
View File
@@ -1,43 +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) {
--- 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;
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)) {
@@ -887,6 +893,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);
}
@@ -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://", "")));
};
Tour.prototype._redirect = function(step, path) {