X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f62465929c480c1c05310df665fae32b5a24fb98..c5b8f44c80d85f73d6eab626e0afc5ab61aa6d20:/project/static/js/editor.js?ds=sidebyside diff --git a/project/static/js/editor.js b/project/static/js/editor.js index 879762cd..6918f9e5 100644 --- a/project/static/js/editor.js +++ b/project/static/js/editor.js @@ -1,10 +1,30 @@ +var editor; +var panel_hooks; + +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() { + var 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); - $.log('new panel - wrap: ', self.wrap); + // $.log('new panel - wrap: ', self.wrap); $(document).bind('panel:unload.' + self.instanceId, function(event, data) { @@ -13,31 +33,38 @@ function Panel(panelWrap) { $(document).bind('panel:contentChanged', function(event, data) { $.log(self, ' got changed event from: ', data); - if(self != data) + if(self != data) { self.otherPanelChanged(event.target); - else + } else { self.markChanged(); - + } return false; }); } Panel.prototype.callHook = function() { - var args = $.makeArray(arguments) - var hookName = args.splice(0,1)[0] - var noHookAction = args.splice(0,1)[0] + var args = $.makeArray(arguments); + var hookName = args.splice(0,1)[0]; + var noHookAction = args.splice(0,1)[0]; var result = false; $.log('calling hook: ', hookName, 'with args: ', args); - if(this.hooks && this.hooks[hookName]) + if(this.hooks && this.hooks[hookName]) { result = this.hooks[hookName].apply(this, args); - else if (noHookAction instanceof Function) + } else if (noHookAction instanceof Function) { result = noHookAction(args); + } 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); + // $.log('preparing xhr load: ', this.wrap); $(document).trigger('panel:unload', this); var self = this; self.current_url = url; @@ -49,65 +76,68 @@ 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.

"); } }); -} +}; Panel.prototype.unload = function(event, data) { - $.log('got unload signal', this, ' target: ', data); - - if( data == this ) { - $.log('unloading', this); + // $.log('got unload signal', this, ' target: ', data); + if( data == this ) { $(this.contentDiv).html(''); + + // disconnect the toolbar + $('div.panel-toolbar span.panel-toolbar-extra', this.wrap).html( + ''); + this.callHook('unload'); this.hooks = null; // flush the hooks return false; - }; -} + } +}; Panel.prototype.refresh = function(event, data) { var self = this; - reload = function() { + var reload = function() { $.log('hard reload for panel ', self.current_url); self.load(self.current_url); return true; - } + }; - if( this.callHook('refresh', reload) ) + if( this.callHook('refresh', reload) ) { $('.change-notification', this.wrap).fadeOut(); -} + } +}; Panel.prototype.otherPanelChanged = function(other) { - $.log('panel ', other, ' changed.'); - if(!this.callHook('dirty')) + $.log('Panel ', this, ' is aware that ', other, ' changed.'); + if(!this.callHook('dirty')) { $('.change-notification', this.wrap).fadeIn(); -} + } +}; Panel.prototype.markChanged = function () { this.wrap.addClass('changed'); -} +}; Panel.prototype.changed = function () { return this.wrap.hasClass('changed'); -} +}; Panel.prototype.unmarkChanged = function () { this.wrap.removeClass('changed'); -} +}; Panel.prototype.saveInfo = function() { var saveInfo = {}; this.callHook('saveInfo', null, saveInfo); return saveInfo; -} +}; Panel.prototype.connectToolbar = function() { @@ -116,18 +146,23 @@ Panel.prototype.connectToolbar = function() // check if there is a one var toolbar = $("div.toolbar", this.contentDiv); - $.log('Connecting toolbar', toolbar); - if(toolbar.length == 0) return; + // $.log('Connecting toolbar', toolbar); + if(toolbar.length === 0) return; + + // move the extra + var extra_buttons = $('span.panel-toolbar-extra button', toolbar); + var placeholder = $('div.panel-toolbar span.panel-toolbar-extra > span', this.wrap); + placeholder.replaceWith(extra_buttons); // 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 @@ -136,10 +171,11 @@ Panel.prototype.connectToolbar = function() active.removeClass('active'); group.addClass('active'); $(".toolbar-button-groups-container p", toolbar).each(function() { - if ( $(this).attr('ui:group') != group_name) + if ( $(this).attr('ui:group') != group_name) { $(this).hide(); - else + } else { $(this).show(); + } }); self.callHook('toolbarResized'); } @@ -147,27 +183,41 @@ Panel.prototype.connectToolbar = function() }); // connect action buttons - var action_buttons = $('*.toolbar-button-groups-container button', toolbar); - action_buttons.each(function() { + var allbuttons = $.makeArray(extra_buttons); + $.merge(allbuttons, + $.makeArray($('*.toolbar-button-groups-container button', toolbar)) ); + + $(allbuttons).each(function() { var button = $(this); var hk = button.attr('ui:hotkey'); - var params = $.evalJSON(button.attr('ui:action-params')); + 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); + editor.callScriptlet(button.attr('ui:action'), self, params); }; // connect button button.click(callback); - + // connect hotkey - if(hk) self.hotkeys[parseInt(hk)] = callback; - + 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 += ' [Alt+'+hk+']'; + if(hk) tooltip += ' ['+hk+']'; button.wTooltip({ delay: 1000, @@ -182,24 +232,36 @@ Panel.prototype.connectToolbar = function() }); } }); -} +}; Panel.prototype.hotkeyPressed = function(event) { - var callback = this.hotkeys[event.keyCode]; + var 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) { - if( event.altKey && (this.hotkeys[event.keyCode] != null) ) + var code = event.keyCode; + if(event.altKey) code = code | 0x100; + if(event.ctrlKey) code = code | 0x200; + if(event.shiftKey) code = code | 0x400; + + $.log(event.character, this.hotkeys[code]); + + if(this.hotkeys[code]) { return true; + } return false; -} +}; -// Panel.prototype.fireEvent = function(name) { $(document).trigger('panel:'+name, this); -} +}; function Editor() { @@ -209,47 +271,6 @@ function Editor() this.scriplets = {}; } -Editor.prototype.setupUI = function() { - // set up the UI visually and attach callbacks - var self = this; - - 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); - var 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(); - }); - - $('.panel-toolbar button.refresh-button', panelWrap).click( - function() { - panel.refresh(); - } ); - }); - - $(document).bind('panel:contentChanged', function() { - self.onContentChanged.apply(self, arguments) - }); - - $('#toolbar-button-save').click( function (event, data) { - self.saveToBranch(); - } ); - $('#toolbar-button-commit').click( function (event, data) { - self.sendPullRequest(); - } ); - self.rootDiv.bind('stopResize', function() { - self.savePanelOptions() - }); -} - Editor.prototype.loadConfig = function() { // Load options from cookie var defaultOptions = { @@ -264,8 +285,9 @@ Editor.prototype.loadConfig = function() { ratio: 0.5 } ], + recentFiles: [], lastUpdate: 0 - } + }; try { var cookie = $.cookie('options'); @@ -276,53 +298,83 @@ Editor.prototype.loadConfig = function() { } catch (e) { this.options = defaultOptions; } + + this.fileOptions = this.options; + var self = this; + + if(!this.options.recentFiles) + this.options.recentFiles = []; + + $.each(this.options.recentFiles, function(index) { + if (fileId == self.options.recentFiles[index].fileId) { + $.log('Found options for', fileId); + self.fileOptions = self.options.recentFiles[index]; + } + }); + $.log(this.options); + $.log('fileOptions', this.fileOptions); this.loadPanelOptions(); -} + this.savePanelOptions(); +}; 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') - ) - }); -} + // var self = this; + // var totalWidth = 0; + // + // $('.panel-wrap', self.rootDiv).each(function(index) { + // var panelWidth = self.fileOptions.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 option', this).each(function() { + // if ($(this).attr('p:panel-name') == self.fileOptions.panels[index].name) { + // $(this).parent('select').val($(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'), + name: $('.panel-toolbar option:selected', this).attr('p:panel-name'), ratio: $(this).width() / self.rootDiv.width() - }) + }); }); self.options.panels = panels; - self.options.lastUpdate = (new Date()).getTime() / 1000; - $.log($.toJSON(self.options)); + + // Dodaj obecnie oglądany plik do listy recentFiles + var recentFiles = [{fileId: fileId, panels: panels}]; + var count = 1; + $.each(self.options.recentFiles, function(index) { + if (count < 5 && fileId != self.options.recentFiles[index].fileId) { + recentFiles.push(self.options.recentFiles[index]); + count++; + } + }); + self.options.recentFiles = recentFiles; + + self.options.lastUpdate = new Date().getTime() / 1000; + $.log($.toJSON(self.options)); $.cookie('options', $.toJSON(self.options), { expires: 7, path: '/' }); -} +}; Editor.prototype.saveToBranch = function(msg) { @@ -330,9 +382,9 @@ Editor.prototype.saveToBranch = function(msg) var self = this; $.log('Saving to local branch - panel:', changed_panel); - if(!msg) msg = "Zapis z edytora platformy."; + if(!msg) msg = "Szybki zapis z edytora platformy."; - if( changed_panel.length == 0) { + if( changed_panel.length === 0) { $.log('Nothing to save.'); return true; /* no changes */ } @@ -342,36 +394,47 @@ Editor.prototype.saveToBranch = function(msg) return false; } - saveInfo = changed_panel.data('ctrl').saveInfo(); - var postData = '' + var saveInfo = changed_panel.data('ctrl').saveInfo(); + var postData = ''; - if(saveInfo.postData instanceof Object) + if (saveInfo.postData instanceof Object) { postData = $.param(saveInfo.postData); - else + } else { postData = saveInfo.postData; - + } + postData += '&' + $.param({ '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); - $('#toolbar-button-save').attr('disabled', 'disabled'); - $('#toolbar-button-commit').removeAttr('disabled'); - if(self.autosaveTimer) - clearTimeout(self.autosaveTimer); + self.refreshPanels(); + - self.showPopup('save-successful'); + if(self.autosaveTimer) { + clearTimeout(self.autosaveTimer); + } + if (data.warnings === null || data.warning === undefined) { + 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 @@ -386,13 +449,13 @@ Editor.prototype.autoSave = function() // first check if there is anything to save $.log('Autosave'); this.saveToBranch("Automatyczny zapis z edytora platformy."); -} +}; Editor.prototype.onContentChanged = function(event, data) { var self = this; - $('#toolbar-button-save').removeAttr('disabled'); - $('#toolbar-button-commit').attr('disabled', 'disabled'); + $('button.provides-save').removeAttr('disabled'); + $('button.requires-save').attr('disabled', 'disabled'); if(this.autosaveTimer) return; this.autosaveTimer = setTimeout( function() { @@ -400,92 +463,111 @@ Editor.prototype.onContentChanged = function(event, data) { }, 300000 ); }; -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; - var panels = $('#' + self.rootDiv.attr('id') +' > *.panel-wrap', self.rootDiv.parent()); - - panels.each(function() { - var panel = $(this).data('ctrl'); - $.log('Refreshing: ', this, panel); - if ( panel.changed() ) - panel.unmarkChanged(); - else - panel.refresh(); + $.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: {} - }); */ -} +}; -Editor.prototype.showPopup = function(name, text) -{ - var self = this; - self.popupQueue.push( [name, text] ) - - if( self.popupQueue.length > 1) - return; - - var box = $('#message-box > #' + name); - $('*.data', box).html(text); - box.fadeIn(); - - self._nextPopup = function() { - var elem = self.popupQueue.pop() - if(elem) { - var box = $('#message-box > #' + elem[0]); - - 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.sendMergeRequest = function (message) { + if( $('.panel-wrap.changed').length !== 0) { + alert("There are unsaved changes - can't commit."); } - setTimeout(self._nextPopup, 5000); -} + var self = this; + + $.ajax({ + url: $('#commit-dialog 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': message + } + }); +}; + +Editor.prototype.postSplitRequest = function(s, f) +{ + $.ajax({ + url: $('#split-dialog form').attr('action'), + dataType: 'html', + success: s, + error: f, + type: 'POST', + data: $('#split-dialog form').serialize() + }); +}; + + +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 - if (!this[scriptlet_id]) + if (!this[scriptlet_id]) { this[scriptlet_id] = scriptlet_func; -} + } +}; Editor.prototype.callScriptlet = function(scriptlet_id, panel, params) { - var func = this[scriptlet_id] - if(!func) + var func = this[scriptlet_id]; + if(!func) { throw 'No scriptlet named "' + scriptlet_id + '" found.'; - + } return func(this, panel, params); -} - +}; + $(function() { $.fbind = function (self, func) { - return function() { return func.apply(self, arguments); }; + return function() { + return func.apply(self, arguments); + }; }; editor = new Editor();