X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e49688b94d3f0f2e72efc2b66f77a5c148aa7ea2..8fc231865e3917a21d19a0c11d9130c5dd838334:/project/static/js/editor.js?ds=inline diff --git a/project/static/js/editor.js b/project/static/js/editor.js index 94b4ca97..f52950ff 100644 --- a/project/static/js/editor.js +++ b/project/static/js/editor.js @@ -152,9 +152,7 @@ Panel.prototype.connectToolbar = function() // move the extra var extra_buttons = $('span.panel-toolbar-extra button', toolbar); var placeholder = $('div.panel-toolbar span.panel-toolbar-extra > span', this.wrap); - placeholder.replaceWith(extra_buttons); - - var action_buttons = $('button', extra_buttons); + placeholder.replaceWith(extra_buttons); // connect group-switch buttons var group_buttons = $('*.toolbar-tabs-container button', toolbar); @@ -185,7 +183,7 @@ Panel.prototype.connectToolbar = function() }); // connect action buttons - var allbuttons = $.makeArray(action_buttons); + var allbuttons = $.makeArray(extra_buttons); $.merge(allbuttons, $.makeArray($('*.toolbar-button-groups-container button', toolbar)) ); @@ -322,30 +320,30 @@ Editor.prototype.loadConfig = function() { }; Editor.prototype.loadPanelOptions = function() { - var self = this; - var totalWidth = 0; - - $('.panel-wrap', self.rootDiv).each(function(index) { - var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width(); - if ($(this).hasClass('last-panel')) { - $(this).css({ - left: totalWidth, - right: 0 - }); - } else { - $(this).css({ - left: totalWidth, - width: panelWidth - }); - totalWidth += panelWidth; - } - $.log('panel:', this, $(this).css('left')); - $('.panel-toolbar option', this).each(function() { - if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) { - $(this).parent('select').val($(this).attr('value')); - } - }); - }); + // var self = this; + // var totalWidth = 0; + // + // $('.panel-wrap', self.rootDiv).each(function(index) { + // var panelWidth = self.fileOptions.panels[index].ratio * self.rootDiv.width(); + // if ($(this).hasClass('last-panel')) { + // $(this).css({ + // left: totalWidth, + // right: 0 + // }); + // } else { + // $(this).css({ + // left: totalWidth, + // width: panelWidth + // }); + // totalWidth += panelWidth; + // } + // $.log('panel:', this, $(this).css('left')); + // $('.panel-toolbar option', this).each(function() { + // if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) { + // $(this).parent('select').val($(this).attr('value')); + // } + // }); + // }); }; Editor.prototype.savePanelOptions = function() { @@ -576,5 +574,5 @@ $(function() { // do the layout editor.loadConfig(); - editor.setupUI(); + editor.setupUI(); });