From: Łukasz Rekucki Date: Fri, 28 Aug 2009 09:53:13 +0000 (+0200) Subject: Merge branch 'master' of git@stigma:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0602376974810e6709409a69b010c5a68b5c3040?hp=203796649b4f3498c6b05adef07fc8cb1ee63f3b Merge branch 'master' of git@stigma:platforma Conflicts: project/static/js/editor.js project/templates/explorer/editor.html --- diff --git a/project/static/js/editor.js b/project/static/js/editor.js index 05232b23..eb87f431 100644 --- a/project/static/js/editor.js +++ b/project/static/js/editor.js @@ -106,78 +106,100 @@ Panel.prototype.saveInfo = function() { function Editor() { - // editor initialization - // this is probably a good place to set config + this.rootDiv = $('#panels'); } Editor.prototype.setupUI = function() { // set up the UI visually and attach callbacks var self = this; - var panelRoot = $('#panels'); - self.rootDiv = panelRoot; + + $('*.panel-wrap:last', this.rootDiv).addClass('last-panel'); - $('*.panel-wrap:last', panelRoot).addClass('last-panel'); - - // Set panel widths from options.panelRatios - if (self.options && self.options.panelRatios) { - var totalWidth = 0; - $('.panel-wrap', panelRoot).each(function(index) { - var panelWidth = self.options.panelRatios[index] * panelRoot.width(); - if ($(this).hasClass('last-panel')) { - $(this).css({ - left: totalWidth, - right: 0, - }); - } else { - $(this).css({ - left: totalWidth, - width: panelWidth, - }); - totalWidth += panelWidth; - } - }); - } - - panelRoot.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery - panelRoot.css('top', ($('#header').outerHeight() ) + 'px'); + self.rootDiv.makeHorizPanel({}); // TODO: this probably doesn't belong into jQuery + self.rootDiv.css('top', ($('#header').outerHeight() ) + 'px'); $('#panels > *.panel-wrap').each(function() { var panelWrap = $(this); $.log('wrap: ', panelWrap); - panelWrap.data('ctrl', new Panel(panelWrap)); // attach controllers to wraps - - $('.panel-toolbar select', panelWrap).change(function() { - panelWrap.data('ctrl').load( $(this).val() ); - }); - }); - - $('#toolbar-button-save').click( function (event, data) { self.saveToBranch(); } ); - - panelRoot.bind('stopResize', function() { - var panelRatios = []; - $('.panel-wrap', panelRoot).each(function() { - panelRatios.push($(this).width() / panelRoot.width()); + panel = new Panel(panelWrap); + panelWrap.data('ctrl', panel); // attach controllers to wraps + panel.load($('.panel-toolbar select', panelWrap).val()); + + $('.panel-toolbar select', panelWrap).change(function() { + var url = $(this).val(); + panelWrap.data('ctrl').load(url); + self.savePanelOptions(); }); - self.options.panelRatios = panelRatios; - $.log($.toJSON(self.options)); - $.cookie('options', $.toJSON(self.options), { expires: 7, path: '/'}); }); $(document).bind('panel:contentChanged', function(event, data) { $('#toolbar-button-save').removeAttr('disabled'); }); - + + $('#toolbar-button-save').click( function (event, data) { self.saveToBranch(); } ); + self.rootDiv.bind('stopResize', function() { self.savePanelOptions() }); } Editor.prototype.loadConfig = function() { // Load options from cookie - var cookie = $.cookie('options') - if (cookie) { + var defaultOptions = { + panels: [ + {name: 'htmleditor', ratio: 0.5}, + {name: 'gallery', ratio: 0.5} + ] + } + + try { + var cookie = $.cookie('options'); this.options = $.secureEvalJSON(cookie); - } else { - // Default options - this.options = {panelRatios: [0.5, 0.5]} + if (!this.options) { + this.options = defaultOptions; + } + } catch (e) { + this.options = defaultOptions; } + $.log(this.options); + + this.loadPanelOptions(); +} + +Editor.prototype.loadPanelOptions = function() { + var self = this; + var totalWidth = 0; + + $('.panel-wrap', self.rootDiv).each(function(index) { + var panelWidth = self.options.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 select', this).val( + $('.panel-toolbar option[name=' + self.options.panels[index].name + ']', this).attr('value') + ) + }); +} + +Editor.prototype.savePanelOptions = function() { + var self = this; + var panels = []; + $('.panel-wrap', self.rootDiv).not('.panel-content-overlay').each(function() { + panels.push({ + name: $('.panel-toolbar option:selected', this).attr('name'), + ratio: $(this).width() / self.rootDiv.width() + }) + }); + self.options.panels = panels; + $.log($.toJSON(self.options)); + $.cookie('options', $.toJSON(self.options), { expires: 7, path: '/'}); } Editor.prototype.saveToBranch = function() { diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html index 66320462..2d63419f 100644 --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@ -23,10 +23,10 @@