X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/300def05b91611b2382df4837c0041d231c8b432..4419f93a01685b9864a6e78cb905c803ec0970b0:/project/static/js/editor.js

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 628c78d4..f7f4cf31 100644
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -1,5 +1,24 @@
+function Hotkey(code) {
+    this.code = code
+    this.has_alt = ((code & 0x01 << 8) != 0)
+    this.has_ctrl = ((code & 0x01 << 9) != 0)
+    this.has_shift = ((code & 0x01 << 10) != 0)
+    this.character = String.fromCharCode(code & 0xff)
+}
+
+
+Hotkey.prototype.toString = function() {
+    mods = []
+    if(this.has_alt) mods.push('Alt')
+    if(this.has_ctrl) mods.push('Ctrl')
+    if(this.has_shift) mods.push('Shift')
+    mods.push('"'+this.character+'"')
+    return mods.join('+')
+}
+
 function Panel(panelWrap) {
     var self = this;
+    self.hotkeys = [];
     self.wrap = panelWrap;
     self.contentDiv = $('.panel-content', panelWrap);
     self.instanceId = Math.ceil(Math.random() * 1000000000);
@@ -51,6 +70,7 @@ Panel.prototype.load = function (url) {
             panel_hooks = null;
             self.connectToolbar();
             self.callHook('load');
+            self.callHook('toolbarResized');
         },
         error: function(request, textStatus, errorThrown) {
             $.log('ajax', url, this.target, 'error:', textStatus, errorThrown);
@@ -110,6 +130,7 @@ Panel.prototype.saveInfo = function() {
 Panel.prototype.connectToolbar = function()
 {
     var self = this;
+    self.hotkeys = [];
     
     // check if there is a one
     var toolbar = $("div.toolbar", this.contentDiv);
@@ -119,42 +140,102 @@ Panel.prototype.connectToolbar = function()
     // connect group-switch buttons
     var group_buttons = $('*.toolbar-tabs-container button', toolbar);
 
-    $.log('Found groups:', group_buttons);
+    // $.log('Found groups:', group_buttons);
 
     group_buttons.each(function() {
         var group = $(this);
         var group_name = group.attr('ui:group');
-        $.log('Connecting group: ' + group_name);
+        // $.log('Connecting group: ' + group_name);
 
         group.click(function() {
             // change the active group
-            var active = $("*.toolbar-tabs-container button.active");
+            var active = $("*.toolbar-tabs-container button.active", toolbar);
             if (active != group) {
                 active.removeClass('active');                
                 group.addClass('active');
-                $(".toolbar-button-groups-container p").each(function() {
+                $(".toolbar-button-groups-container p", toolbar).each(function() {
                     if ( $(this).attr('ui:group') != group_name) 
                         $(this).hide();
                     else
                         $(this).show();
                 });
+                self.callHook('toolbarResized');
             }
         });        
     });
 
     // connect action buttons
-    var action_buttons = $('*.toolbar-button-groups-container button');
+    var action_buttons = $('*.toolbar-button-groups-container button', toolbar);
     action_buttons.each(function() {
-        var button = $(this); 
-        
-        button.click(function() {
-           editor.callScriptlet(button.attr('ui:action'),
-                self, eval(button.attr('ui:action-params')) );
-        });
+        var button = $(this);
+        var hk = button.attr('ui:hotkey');
+        if(hk) hk = new Hotkey( parseInt(hk) );
+
+        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);
+        };
+
+        // connect button
+        button.click(callback);
+       
+        // connect hotkey
+        if(hk) {
+            self.hotkeys[hk.code] = callback;
+             $.log('hotkey', hk);
+        }
         
+        // tooltip
+        if (button.attr('ui:tooltip') )
+        {
+            var tooltip = button.attr('ui:tooltip');
+            if(hk) tooltip += ' ['+hk+']';
+
+            button.wTooltip({
+                delay: 1000,
+                style: {
+                    border: "1px solid #7F7D67",
+                    opacity: 0.9,
+                    background: "#FBFBC6",
+                    padding: "1px",
+                    fontSize: "12px"
+                },
+                content: tooltip
+            });
+        }
     });
 }
 
+Panel.prototype.hotkeyPressed = function(event)
+{
+    code = event.keyCode;
+    if(event.altKey) code = code | 0x100;
+    if(event.ctrlKey) code = code | 0x200;
+    if(event.shiftKey) code = code | 0x400;
+
+    var callback = this.hotkeys[code];
+    if(callback) callback();
+}
+
+Panel.prototype.isHotkey = function(event) {
+    code = event.keyCode;
+    if(event.altKey) code = code | 0x100;
+    if(event.ctrlKey) code = code | 0x200;
+    if(event.shiftKey) code = code | 0x400;
+
+    if(this.hotkeys[code] != null)
+        return true;
+        
+    return false;
+}
+
 //
 Panel.prototype.fireEvent = function(name) {
     $(document).trigger('panel:'+name, this);
@@ -201,8 +282,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()
@@ -313,24 +407,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
@@ -352,6 +456,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() {
@@ -359,11 +464,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() )
@@ -374,59 +478,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);
-    box.fadeIn();
+    $('*.data', box).html(text || '');
+    box.fadeIn(100);
  
-    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(100, 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(100);
+                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
@@ -443,6 +603,12 @@ Editor.prototype.callScriptlet = function(scriptlet_id, panel, params) {
 }
   
 $(function() {
+    $.fbind = function (self, func) {
+        return function() { 
+            return func.apply(self, arguments);
+        };
+    };
+    
     editor = new Editor();
 
     // do the layout