tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX Dont update preview iframe if hidden

Browse Source 
Updating the iframe src when the iframe isnt visible in IE8 causes a
view disconcerting font glitch (and it slows down navigation anyway),
so if the iframe isnt visible, delay setting the src until it is
This commit is contained in:
Hamish Friedlander 2013-08-15 14:28:47 +12:00
parent c59305d6d4
commit 0ca4969cda
2 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/javascript/LeftAndMain.Layout.js
View File

@ -104,9 +104,21 @@
} }
} }
// Calculate what columns are already hidden pre-layout
var prehidden = {
content: spec.content.hasClass('column-hidden'),
preview: spec.preview.hasClass('column-hidden')
};
// Calculate what columns will be hidden (zero width) post-layout
var posthidden = {
content: contentWidth === 0,
preview: previewWidth === 0
};
// Apply classes for elements that might not be visible at all. // Apply classes for elements that might not be visible at all.
spec.content.toggleClass('column-hidden', contentWidth===0); spec.content.toggleClass('column-hidden', posthidden.content);
spec.preview.toggleClass('column-hidden', previewWidth===0); spec.preview.toggleClass('column-hidden', posthidden.preview);
// Apply the widths to columns, and call subordinate layouts to arrange the children. // Apply the widths to columns, and call subordinate layouts to arrange the children.
menu.bounds({'x': left, 'y': top, 'height': bottom - top, 'width': menuWidth}); menu.bounds({'x': left, 'y': top, 'height': bottom - top, 'width': menuWidth});
@ -115,12 +127,15 @@
left += menuWidth; left += menuWidth;
content.bounds({'x': left, 'y': top, 'height': bottom - top, 'width': contentWidth}); content.bounds({'x': left, 'y': top, 'height': bottom - top, 'width': contentWidth});
content.doLayout(); if (!posthidden.content) content.doLayout();
left += contentWidth; left += contentWidth;
preview.bounds({'x': left, 'y': top, 'height': bottom - top, 'width': previewWidth}); preview.bounds({'x': left, 'y': top, 'height': bottom - top, 'width': previewWidth});
preview.doLayout(); if (!posthidden.preview) preview.doLayout();
if (posthidden.content !== prehidden.content) spec.content.trigger('columnvisibilitychanged');
if (posthidden.preview !== prehidden.preview) spec.preview.trigger('columnvisibilitychanged');
return container; return container;
}; };

38
admin/javascript/LeftAndMain.Preview.js
View File

@ -198,6 +198,7 @@
* Caveat: the preview will be automatically enabled when ".cms-previewable" class is detected. * Caveat: the preview will be automatically enabled when ".cms-previewable" class is detected.
*/ */
disablePreview: function() { disablePreview: function() {
this.setPendingURL(null);
this._loadUrl('about:blank'); this._loadUrl('about:blank');
this._block(); this._block();
this.changeMode('content', false); this.changeMode('content', false);
@ -304,6 +305,18 @@
} }
}, },
/** @var string A URL that should be displayed in this preview panel once it becomes visible */
PendingURL: null,
oncolumnvisibilitychanged: function() {
var url = this.getPendingURL();
if (url && !this.is('.column-hidden')) {
this.setPendingURL(null);
this._loadUrl(url);
this._unblock();
}
},
/** /**
* Update preview whenever a form is submitted. * Update preview whenever a form is submitted.
* This is an alternative to the LeftAndmMain::loadPanel functionality which we already * This is an alternative to the LeftAndmMain::loadPanel functionality which we already
@ -369,20 +382,37 @@
}); });
} }
var url = null;
if (currentState[0]) { if (currentState[0]) {
// State is available on the newly loaded content. Get it. // State is available on the newly loaded content. Get it.
this._loadUrl(currentState[0].url); url = currentState[0].url;
this._unblock();
} else if (states.length) { } else if (states.length) {
// Fall back to the first available content state. // Fall back to the first available content state.
this.setCurrentStateName(states[0].name); this.setCurrentStateName(states[0].name);
this._loadUrl(states[0].url); url = states[0].url;
this._unblock();
} else { } else {
// No state available at all. // No state available at all.
this.setCurrentStateName(null); this.setCurrentStateName(null);
}
// If this preview panel isn't visible at the moment, delay loading the URL until it (maybe) is later
if (this.is('.column-hidden')) {
this.setPendingURL(url);
this._loadUrl('about:blank');
this._block(); this._block();
} }
else {
this.setPendingURL(null);
if (url) {
this._loadUrl(url);
this._unblock();
}
else {
this._block();
}
}
return this; return this;
}, },