X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f62465929c480c1c05310df665fae32b5a24fb98..537012c60af1ea1c0e39949c58df4647ddadc72b:/project/static/js/editor.js?ds=inline

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 879762cd..3490b9a1 100644
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -151,10 +151,17 @@ Panel.prototype.connectToolbar = function()
     action_buttons.each(function() {
         var button = $(this);
         var hk = button.attr('ui:hotkey');
-        var params = $.evalJSON(button.attr('ui:action-params'));
+
+        try {
+            var params = $.evalJSON(button.attr('ui:action-params'));
+        } catch(object) {
+           $.log('JSON exception in ', button, ': ', object);
+           button.attr('disabled', 'disabled');
+           return;
+        }
 
         var callback = function() {
-           editor.callScriptlet(button.attr('ui:action'), self, params);
+            editor.callScriptlet(button.attr('ui:action'), self, params);
         };
 
         // connect button
@@ -242,8 +249,21 @@ Editor.prototype.setupUI = function() {
     $('#toolbar-button-save').click( function (event, data) { 
         self.saveToBranch();
     } );
+
+    $('#toolbar-button-update').click( function (event, data) {
+        if (self.updateUserBranch()) {
+            // commit/update can be called only after proper, save
+            // this means all panels are clean, and will get refreshed
+             // do this only, when there are any changes to local branch
+            self.refreshPanels();
+        }
+    } );
+
     $('#toolbar-button-commit').click( function (event, data) { 
         self.sendPullRequest();
+        event.preventDefault();
+        event.stopPropagation();
+        return false;
     } );
     self.rootDiv.bind('stopResize', function() { 
         self.savePanelOptions()
@@ -354,24 +374,34 @@ Editor.prototype.saveToBranch = function(msg)
         'commit_message': msg
     })
 
+    self.showPopup('save-waiting', '', -1);
+
     $.ajax({
         url: saveInfo.url,
         dataType: 'json',
         success: function(data, textStatus) {
-            if (data.result != 'ok')
-                self.showPopup('save-error', data.errors[0]);
+            if (data.result != 'ok') {
+                self.showPopup('save-error', (data.errors && data.errors[0]) || 'Nieznany błąd X_X.');
+            }
             else {
-                self.refreshPanels(changed_panel);
+                self.refreshPanels();
                 $('#toolbar-button-save').attr('disabled', 'disabled');
                 $('#toolbar-button-commit').removeAttr('disabled');
+                $('#toolbar-button-update').removeAttr('disabled');
                 if(self.autosaveTimer)
                     clearTimeout(self.autosaveTimer);
 
-                self.showPopup('save-successful');
+                if (data.warnings == null)
+                    self.showPopup('save-successful');
+                else
+                    self.showPopup('save-warn', data.warnings[0]);
             }
+            
+            self.advancePopupQueue();
         },
         error: function(rq, tstat, err) {
-            self.showPopup('save-error');
+            self.showPopup('save-error', '- bład wewnętrzny serwera.');
+            self.advancePopupQueue();
         },
         type: 'POST',
         data: postData
@@ -393,6 +423,7 @@ Editor.prototype.onContentChanged = function(event, data) {
 
     $('#toolbar-button-save').removeAttr('disabled');
     $('#toolbar-button-commit').attr('disabled', 'disabled');
+    $('#toolbar-button-update').attr('disabled', 'disabled');
     
     if(this.autosaveTimer) return;
     this.autosaveTimer = setTimeout( function() {
@@ -400,11 +431,10 @@ Editor.prototype.onContentChanged = function(event, data) {
     }, 300000 );
 };
 
-Editor.prototype.refreshPanels = function(goodPanel) {
+Editor.prototype.refreshPanels = function() {
     var self = this;
-    var panels = $('#' + self.rootDiv.attr('id') +' > *.panel-wrap', self.rootDiv.parent());
 
-    panels.each(function() {
+    self.allPanels().each(function() {
         var panel = $(this).data('ctrl');
         $.log('Refreshing: ', this, panel);
         if ( panel.changed() )
@@ -415,59 +445,115 @@ Editor.prototype.refreshPanels = function(goodPanel) {
 };		
 
 
+Editor.prototype.updateUserBranch = function() {
+    if( $('.panel-wrap.changed').length != 0)
+        alert("There are unsaved changes - can't update.");
+
+    var self = this;
+    $.ajax({
+        url: $('#toolbar-button-update').attr('ui:ajax-action'),
+	dataType: 'json',
+	success: function(data, textStatus) {
+                switch(data.result) {
+                    case 'done':
+                        self.showPopup('generic-yes', 'Plik uaktualniony.');
+                        self.refreshPanels()
+                        break;
+                    case 'nothing-to-do':
+                        self.showPopup('generic-info', 'Brak zmian do uaktualnienia.');
+                        break;
+                    default:
+                        self.showPopup('generic-error', data.errors && data.errors[0]);
+                }
+	},
+	error: function(rq, tstat, err) {
+		self.showPopup('generic-error', 'Błąd serwera: ' + err);
+	},
+	type: 'POST',
+	data: {}
+    });
+}
+
 Editor.prototype.sendPullRequest = function () {
     if( $('.panel-wrap.changed').length != 0)        
-        alert("There are unsaved changes - can't make a pull request.");
-
-    this.showPopup('not-implemented');
-/*
-	$.ajax({
-		url: '/pull-request',
-		dataType: 'json',
-		success: function(data, textStatus) {
-            $.log('data: ' + data);
-		},
-		error: function(rq, tstat, err) {
-		 	$.log('commit error', rq, tstat, err);
-		},
-		type: 'POST',
-		data: {}
-	}); */
+        alert("There are unsaved changes - can't commit.");
+
+    var self =  this;
+
+    /* this.showPopup('not-implemented'); */
+
+    $.log('URL !: ', $('#toolbar-commit-form').attr('action'));
+    
+    $.ajax({        
+        url: $('#toolbar-commit-form').attr('action'),
+	dataType: 'json',
+	success: function(data, textStatus) {
+                switch(data.result) {
+                    case 'done':
+                        self.showPopup('generic-yes', 'Łączenie zmian powiodło się.');
+
+                        if(data.localmodified)
+                            self.refreshPanels()
+                        
+                        break;
+                    case 'nothing-to-do':
+                        self.showPopup('generic-info', 'Brak zmian do połaczenia.');
+                        break;
+                    default:
+                        self.showPopup('generic-error', data.errors && data.errors[0]);
+                }
+	},
+	error: function(rq, tstat, err) {
+		self.showPopup('generic-error', 'Błąd serwera: ' + err);
+	},
+	type: 'POST',
+	data: {'message': $('#toolbar-commit-message').val() }
+    }); 
 }
 
-Editor.prototype.showPopup = function(name, text) 
+Editor.prototype.showPopup = function(name, text, timeout)
 {
+    timeout = timeout || 4000;
     var self = this;
-    self.popupQueue.push( [name, text] )
+    self.popupQueue.push( [name, text, timeout] )
 
     if( self.popupQueue.length > 1) 
         return;
 
     var box = $('#message-box > #' + name);
-    $('*.data', box).html(text);
+    $('*.data', box).html(text || '');
     box.fadeIn();
  
-    self._nextPopup = function() {
-        var elem = self.popupQueue.pop()
-        if(elem) {
-            var box = $('#message-box > #' + elem[0]);
+    if(timeout > 0)
+        setTimeout( $.fbind(self, self.advancePopupQueue), timeout);
+};
 
-            box.fadeOut(300, function() {
-                $('*.data', box).html();
-    
-                if( self.popupQueue.length > 0) {
-                    box = $('#message-box > #' + self.popupQueue[0][0]);
-                    $('*.data', box).html(self.popupQueue[0][1]);
-                    box.fadeIn();
-                    setTimeout(self._nextPopup, 5000);
-                }
-            });
-        }
+Editor.prototype.advancePopupQueue = function() {
+    var self = this;
+    var elem = this.popupQueue.shift();
+    if(elem) {
+        var box = $('#message-box > #' + elem[0]);
+
+        box.fadeOut(200, function()
+        {
+            $('*.data', box).html();
+
+            if( self.popupQueue.length > 0) {
+                var ibox = $('#message-box > #' + self.popupQueue[0][0]);
+                $('*.data', ibox).html(self.popupQueue[0][1]);
+                ibox.fadeIn();
+                if(self.popupQueue[0][2] > 0)
+                    setTimeout( $.fbind(self, self.advancePopupQueue), self.popupQueue[0][2]);
+            }
+        });
     }
+};
 
-    setTimeout(self._nextPopup, 5000);
+Editor.prototype.allPanels = function() {
+    return $('#' + this.rootDiv.attr('id') +' > *.panel-wrap', this.rootDiv.parent());
 }
 
+
 Editor.prototype.registerScriptlet = function(scriptlet_id, scriptlet_func)
 {
     // I briefly assume, that it's verified not to break the world on SS
@@ -485,7 +571,9 @@ Editor.prototype.callScriptlet = function(scriptlet_id, panel, params) {
   
 $(function() {
     $.fbind = function (self, func) {
-        return function() { return func.apply(self, arguments); };
+        return function() { 
+            return func.apply(self, arguments);
+        };
     };
     
     editor = new Editor();