X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/970685936cdd7b70e3efa2f2506f66198049b16d..fef7f24f34c07be9d9aff6db434e997f9a1f3451:/project/static/js/editor.js?ds=inline

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 36dfcf27..e37228ce 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("<p>Wystapił błąd podczas wczytywania panelu.");
+            $(self.contentDiv).html("<p>Wystapił błąd podczas wczytywania panelu.</p>");
         }
     });
 }
@@ -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);
+    placeholder.hide();
 
     var action_buttons = $('button', extra_buttons);
 
@@ -310,9 +315,11 @@ Editor.prototype.loadPanelOptions = function() {
             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')
-            )
+        $('.panel-toolbar option', this).each(function() {
+            if ($(this).attr('p:panel-name') == self.options.panels[index].name) {
+                $(this).parent('select').val($(this).attr('value'));
+            }
+        });
     });   
 }
 
@@ -321,7 +328,7 @@ Editor.prototype.savePanelOptions = function() {
     var panels = [];
     $('.panel-wrap', self.rootDiv).not('.panel-content-overlay').each(function() {
         panels.push({
-            name: $('.panel-toolbar option:selected', this).attr('name'),
+            name: $('.panel-toolbar option:selected', this).attr('p:panel-name'),
             ratio: $(this).width() / self.rootDiv.width()
         })
     });
@@ -375,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);
 
@@ -454,8 +460,10 @@ Editor.prototype.sendMergeRequest = function (message) {
     if( $('.panel-wrap.changed').length != 0)        
         alert("There are unsaved changes - can't commit.");
 
-    var self =  this;
-    $.log('URL !: ', $('#commit-dialog form').attr('action'));
+    var self =  this;    
+
+    $('#commit-dialog-related-issues input:checked').
+        each(function() { message += ' refs #' + $(this).val(); });  
     
     $.ajax({        
         url: $('#commit-dialog form').attr('action'),