X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f31bb368a2cad9a61e4fc652fa4b40c4114a128c..a5999e7b582435f9a77b5847f1590ebb8d7ccb36:/project/static/js/editor.js diff --git a/project/static/js/editor.js b/project/static/js/editor.js index 46d39419..69c27b1e 100644 --- a/project/static/js/editor.js +++ b/project/static/js/editor.js @@ -45,7 +45,7 @@ Panel.prototype.callHook = function() { var noHookAction = args.splice(0,1)[0] var result = false; - // $.log('calling hook: ', hookName, 'with args: ', args); + $.log('calling hook: ', hookName, 'with args: ', args); if(this.hooks && this.hooks[hookName]) result = this.hooks[hookName].apply(this, args); else if (noHookAction instanceof Function) @@ -53,6 +53,12 @@ Panel.prototype.callHook = function() { return result; } +Panel.prototype._endload = function () { + // this needs to be here, so we + this.connectToolbar(); + this.callHook('toolbarResized'); +} + Panel.prototype.load = function (url) { // $.log('preparing xhr load: ', this.wrap); $(document).trigger('panel:unload', this); @@ -66,14 +72,12 @@ Panel.prototype.load = function (url) { panel_hooks = null; $(self.contentDiv).html(data); self.hooks = panel_hooks; - panel_hooks = null; - self.connectToolbar(); - self.callHook('load'); - self.callHook('toolbarResized'); + panel_hooks = null; + self.callHook('load'); }, error: function(request, textStatus, errorThrown) { $.log('ajax', url, this.target, 'error:', textStatus, errorThrown); - $(self.contentDiv).html("
WystapiÅ bÅÄ d podczas wczytywania panelu."); + $(self.contentDiv).html("
WystapiÅ bÅÄ d podczas wczytywania panelu.
"); } }); } @@ -142,6 +146,7 @@ Panel.prototype.connectToolbar = function() var extra_buttons = $('span.panel-toolbar-extra', toolbar); var placeholder = $('div.panel-toolbar span.panel-toolbar-extra', this.wrap); placeholder.replaceWith(extra_buttons); + extra_buttons.hide(); var action_buttons = $('button', extra_buttons); @@ -377,9 +382,8 @@ Editor.prototype.saveToBranch = function(msg) } else { self.refreshPanels(); - $('#toolbar-button-save').attr('disabled', 'disabled'); - $('#toolbar-button-commit').removeAttr('disabled'); - $('#toolbar-button-update').removeAttr('disabled'); + + if(self.autosaveTimer) clearTimeout(self.autosaveTimer);