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

Fix split mode disappearing as an option

Browse Source
This commit is contained in:
Christopher Joe 2016-10-11 14:41:08 +13:00
parent a03abe1356
commit 7b36df286e
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/client/dist/js/bundle.js vendored
View File

@ -984,7 +984,7 @@ e||(this.find(".cms-panel-layout").redraw(),this.find(".cms-content-fields[data-
}},setProperMode:function p(){var e=this.getLayoutOptions(),t=e.mode }},setProperMode:function p(){var e=this.getLayoutOptions(),t=e.mode
this.clearViewMode() this.clearViewMode()
var n=this.find(".cms-content"),i=this.find(".cms-preview") var n=this.find(".cms-content"),i=this.find(".cms-preview")
if(n.css({"min-width":""}),i.css({"min-width":""}),n.width()+i.width()>=e.minContentWidth+e.minPreviewWidth)n.css({"min-width":e.minContentWidth}),i.css({"min-width":e.minPreviewWidth}),i.trigger("enable") if(n.css({"min-width":0}),i.css({"min-width":0}),n.width()+i.width()>=e.minContentWidth+e.minPreviewWidth)n.css({"min-width":e.minContentWidth}),i.css({"min-width":e.minPreviewWidth}),i.trigger("enable")
else if(i.trigger("disable"),"split"==t)return i.trigger("forcecontent"),!0 else if(i.trigger("disable"),"split"==t)return i.trigger("forcecontent"),!0
return this.addClass("cms-container--"+t+"-mode"),!1},checkCanNavigate:function h(e){var t=this._findFragments(e||["Content"]),n=t.find(":data(changetracker)").add(t.filter(":data(changetracker)")),i=!0 return this.addClass("cms-container--"+t+"-mode"),!1},checkCanNavigate:function h(e){var t=this._findFragments(e||["Content"]),n=t.find(":data(changetracker)").add(t.filter(":data(changetracker)")),i=!0
@ -1359,9 +1359,9 @@ n.addClass("center"),n.bind("load",function(){t._adjustIframeForPreview(),t._loa
this._super()},_supportsLocalStorage:function f(){var e=new Date,t,n this._super()},_supportsLocalStorage:function f(){var e=new Date,t,n
try{return(t=window.localStorage).setItem(e,e),n=t.getItem(e)==e,t.removeItem(e),n&&t}catch(i){console.warn("localStorge is not available due to current browser / system settings.")}},onforcecontent:function p(){ try{return(t=window.localStorage).setItem(e,e),n=t.getItem(e)==e,t.removeItem(e),n&&t}catch(i){console.warn("localStorge is not available due to current browser / system settings.")}},onforcecontent:function p(){
this.changeMode("content",!1)},onenable:function h(){var t=e(".preview-mode-selector") this.changeMode("content",!1)},onenable:function h(){var t=e(".preview-mode-selector")
t.find('option[value="split"]').prop("disabled",!1),t.removeClass("split-disabled"),t.find(".disabled-tooltip").hide()},ondisable:function m(){var t=e(".preview-mode-selector") t.removeClass("split-disabled"),t.find(".disabled-tooltip").hide()},ondisable:function m(){var t=e(".preview-mode-selector")
t.find('option[value="split"]').prop("disabled",!0),t.addClass("split-disabled"),t.find(".disabled-tooltip").show()},_block:function g(){return this.find(".preview-note").show(),this.find(".cms-preview-overlay").show(), t.addClass("split-disabled"),t.find(".disabled-tooltip").show()},_block:function g(){return this.find(".preview-note").show(),this.find(".cms-preview-overlay").show(),this},_unblock:function v(){return this.find(".preview-note").hide(),
this},_unblock:function v(){return this.find(".preview-note").hide(),this.find(".cms-preview-overlay").hide(),this},_initialiseFromContent:function y(){var t,n this.find(".cms-preview-overlay").hide(),this},_initialiseFromContent:function y(){var t,n
return e(".cms-previewable").length?(t=this.loadState("mode"),n=this.loadState("size"),this._moveNavigator(),t&&"content"==t||(this.enablePreview(),this._loadCurrentState()),this.redraw(),t&&this.changeMode(t), return e(".cms-previewable").length?(t=this.loadState("mode"),n=this.loadState("size"),this._moveNavigator(),t&&"content"==t||(this.enablePreview(),this._loadCurrentState()),this.redraw(),t&&this.changeMode(t),
n&&this.changeSize(n)):this.disablePreview(),this},"from .cms-container":{onafterstatechange:function b(e,t){t.xhr.getResponseHeader("X-ControllerURL")||this._initialiseFromContent()}},PendingURL:null, n&&this.changeSize(n)):this.disablePreview(),this},"from .cms-container":{onafterstatechange:function b(e,t){t.xhr.getResponseHeader("X-ControllerURL")||this._initialiseFromContent()}},PendingURL:null,
oncolumnvisibilitychanged:function _(){var e=this.getPendingURL() oncolumnvisibilitychanged:function _(){var e=this.getPendingURL()

4
admin/client/src/legacy/LeftAndMain.Preview.js
View File

@ -298,8 +298,6 @@ $.entwine('ss.preview', function($){
onenable: function () { onenable: function () {
var $viewModeSelector = $('.preview-mode-selector'); var $viewModeSelector = $('.preview-mode-selector');
$viewModeSelector.find('option[value="split"]').prop('disabled', false);
$viewModeSelector.removeClass('split-disabled'); $viewModeSelector.removeClass('split-disabled');
$viewModeSelector.find('.disabled-tooltip').hide(); $viewModeSelector.find('.disabled-tooltip').hide();
}, },
@ -307,8 +305,6 @@ $.entwine('ss.preview', function($){
ondisable: function () { ondisable: function () {
var $viewModeSelector = $('.preview-mode-selector'); var $viewModeSelector = $('.preview-mode-selector');
$viewModeSelector.find('option[value="split"]').prop('disabled', true);
$viewModeSelector.addClass('split-disabled'); $viewModeSelector.addClass('split-disabled');
$viewModeSelector.find('.disabled-tooltip').show(); $viewModeSelector.find('.disabled-tooltip').show();
}, },

4
admin/client/src/legacy/LeftAndMain.js
View File

@ -328,8 +328,8 @@ $.entwine('ss', function($) {
var content = this.find('.cms-content'); var content = this.find('.cms-content');
var preview = this.find('.cms-preview'); var preview = this.find('.cms-preview');
content.css({'min-width': ''}); content.css({'min-width': 0});
preview.css({'min-width': ''}); preview.css({'min-width': 0});
if (content.width() + preview.width() >= options.minContentWidth + options.minPreviewWidth) { if (content.width() + preview.width() >= options.minContentWidth + options.minPreviewWidth) {
content.css({'min-width': options.minContentWidth}); content.css({'min-width': options.minContentWidth});