Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Avoid adding to browser history when setting location on iframe

  • Loading branch information...
commit 0dc51c5d603d22e5c61a90c3fb598cc39ac810e7 1 parent 058fae2
Henrik Hofmeister authored
Showing with 6 additions and 5 deletions.
  1. +6 −5 js/lib/widget.js
11 js/lib/widget.js
View
@@ -1464,14 +1464,14 @@ $wb.ui.IFrame = $wb.Class('IFrame', {
//Or else this may cause leaks.
try {
this.doc().remove();
- } catch (e) {
- }
- ;
+ } catch (e) {}
this._showLoadScreen();
this.opts.src = "" + arguments[0];
- if (this.window())
- this.window().location = this.opts.src;
+ if (this.window()) {
+ this.window().location.replace(this.opts.src);
+ }
+
if (this.opts.src === this.opts.blankSrc)
this.showBlankScreen();
return this;
@@ -1492,6 +1492,7 @@ $wb.ui.IFrame = $wb.Class('IFrame', {
}
if (this.opts.showBlankScreen
&& ((this.opts.src === this.opts.blankSrc) || force)) {
+ console.log('Show blank screen',this.opts,force);
this._loadScreen.html(this.opts.blankScreenText);
this._loadScreen.outerWidth(this.target().outerWidth());
this._loadScreen.outerHeight(this.target().outerHeight());
Please sign in to comment.
Something went wrong with that request. Please try again.