mirror of
https://github.com/YunoHost-Apps/piwigo_ynh.git
synced 2024-09-03 20:06:03 +02:00
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
--- 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) {
|