From: zuber Date: Tue, 6 Oct 2009 11:44:35 +0000 (+0200) Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/cf166fd1eaaeddfa266aa46b6442ad2315095c2c?hp=d5cf348c60b8ddc92ce9dae6080d3d276696ffec Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma --- diff --git a/apps/explorer/context_processors.py b/apps/explorer/context_processors.py index 634b0155..eff3032c 100755 --- a/apps/explorer/context_processors.py +++ b/apps/explorer/context_processors.py @@ -4,6 +4,8 @@ __date__ ="$2009-09-03 08:34:10$" def settings(request): from django.conf import settings - return {'MEDIA_URL': settings.MEDIA_URL, 'STATIC_URL': settings.STATIC_URL} + return {'MEDIA_URL': settings.MEDIA_URL, + 'STATIC_URL': settings.STATIC_URL, + 'REDMINE_URL': settings.REDMINE_URL } diff --git a/project/static/js/button_scripts.js b/project/static/js/button_scripts.js index ca37eb41..40f45f6f 100644 --- a/project/static/js/button_scripts.js +++ b/project/static/js/button_scripts.js @@ -42,11 +42,11 @@ function ScriptletCenter() output = start_tag + end_tag; } - if (text.length === 0) { - this.XMLEditorMoveCursorForward(context, params.tag.length + 2); - } - this.XMLEditorReplaceSelectedText(context, output); + + if (text.length == 0) { + this.XMLEditorMoveCursorForward(context, -params.tag.length-3); + } }.bind(this); this.scriptlets['lineregexp'] = function(context, params) { diff --git a/project/static/js/lib/codemirror/editor.js b/project/static/js/lib/codemirror/editor.js index b7c53c70..3d7a2053 100644 --- a/project/static/js/lib/codemirror/editor.js +++ b/project/static/js/lib/codemirror/editor.js @@ -658,7 +658,7 @@ var Editor = (function(){ // Intercept enter and tab, and assign their new functions. keyDown: function(event) { if (this.frozen == "leave") this.frozen = null; - if (this.frozen && (!this.keyFilter || this.keyFilter(event.keyCode))) { + if (this.frozen && (!this.keyFilter || this.keyFilter(event))) { event.stop(); this.frozen(event); return; diff --git a/project/static/js/views/button_toolbar.js b/project/static/js/views/button_toolbar.js index 71bfa975..7e4b6eab 100644 --- a/project/static/js/views/button_toolbar.js +++ b/project/static/js/views/button_toolbar.js @@ -39,23 +39,30 @@ var ButtonToolbarView = View.extend({ $(self.element).trigger('resize'); }); - $('.buttontoolbarview-button', this.element).bind('click.buttontoolbarview', function(event) { - var groupIndex = parseInt($(this).attr('ui:groupindex'), 10); - var buttonIndex = parseInt($(this).attr('ui:buttonindex'), 10); - var button = self.get('buttons')[groupIndex].buttons[buttonIndex]; - var scriptletId = button.scriptlet_id; - var params = eval('(' + button.params + ')'); // To nie powinno być potrzebne - - console.log('Executing', scriptletId, 'with params', params); - try { - scriptletCenter.scriptlets[scriptletId](self.parent, params); - } catch(e) { - console.log("Scriptlet", scriptletId, "failed."); - } - }); - + $('.buttontoolbarview-button', this.element). + bind('click.buttontoolbarview', this.buttonPressed.bind(this) ); + $(this.element).trigger('resize'); }, + + buttonPressed: function(event) + { + var target = event.target; + + var groupIndex = parseInt($(target).attr('ui:groupindex'), 10); + var buttonIndex = parseInt($(target).attr('ui:buttonindex'), 10); + var button = this.get('buttons')[groupIndex].buttons[buttonIndex]; + var scriptletId = button.scriptlet_id; + var params = eval('(' + button.params + ')'); // To nie powinno być potrzebne + + console.log('Executing', scriptletId, 'with params', params); + try { + scriptletCenter.scriptlets[scriptletId](this.parent, params); + } catch(e) { + console.log("Scriptlet", scriptletId, "failed."); + } + + }, dispose: function() { $('.buttontoolbarview-tab', this.element).unbind('click.buttontoolbarview'); diff --git a/project/static/js/views/flash.js b/project/static/js/views/flash.js index 3f4f4759..b2240e43 100644 --- a/project/static/js/views/flash.js +++ b/project/static/js/views/flash.js @@ -27,9 +27,14 @@ var FlashView = View.extend({ modelFirstFlashMessageChanged: function(property, value) { this.element.fadeOut('slow', function() { + this.element.css({'z-index': 0}); this.shownMessage = value; this.render(); - this.element.fadeIn('slow'); + + if(this.shownMessage) { + this.element.css({'z-index': 1000}); + this.element.fadeIn('slow'); + } }.bind(this)); } }); diff --git a/project/static/js/views/html.js b/project/static/js/views/html.js index 4dc3d544..a8eb4d01 100644 --- a/project/static/js/views/html.js +++ b/project/static/js/views/html.js @@ -20,6 +20,9 @@ var HTMLView = View.extend({ modelDataChanged: function(property, value) { $('.htmlview', this.element).html(value); + + var base = this.$printLink.attr('ui:baseref'); + this.$printLink.attr('href', base + "?revision=" + this.model.get('revision')); }, modelStateChanged: function(property, value) { @@ -38,21 +41,9 @@ var HTMLView = View.extend({ render: function() { - $('.html-print-link', this.element).unbind(); - + if(this.$printLink) this.$printLink.unbind(); this._super(); - - $('.html-print-link', this.element).mouseover( - this.printView.bind(this) - ); - }, - - - printView: function(event) { - var base = $(event.target).attr('ui:baseref'); - $(event.target).attr('href', base + "?revision=" + this.model.get('revision') ); - - return true; + this.$printLink = $('.html-print-link', this.element); }, reload: function() { diff --git a/project/static/js/views/xml.js b/project/static/js/views/xml.js index caafa715..02154723 100644 --- a/project/static/js/views/xml.js +++ b/project/static/js/views/xml.js @@ -1,92 +1,167 @@ /*global View CodeMirror ButtonToolbarView render_template panels */ var XMLView = View.extend({ - _className: 'XMLView', - element: null, - model: null, - template: 'xml-view-template', - editor: null, - buttonToolbar: null, + _className: 'XMLView', + element: null, + model: null, + template: 'xml-view-template', + editor: null, + buttonToolbar: null, - init: function(element, model, parent, template) { - this._super(element, model, template); - this.parent = parent; - this.buttonToolbar = new ButtonToolbarView( - $('.xmlview-toolbar', this.element), - this.model.toolbarButtonsModel, parent); + init: function(element, model, parent, template) { + this._super(element, model, template); + this.parent = parent; + this.buttonToolbar = new ButtonToolbarView( + $('.xmlview-toolbar', this.element), + this.model.toolbarButtonsModel, parent); - $('.xmlview-toolbar', this.element).bind('resize.xmlview', this.resized.bind(this)); + this.hotkeys = []; + var self = this; + + $('.xmlview-toolbar', this.element).bind('resize.xmlview', this.resized.bind(this)); + - this.parent.freeze('Ładowanie edytora...'); - this.editor = new CodeMirror($('.xmlview', this.element).get(0), { - parserfile: 'parsexml.js', - path: "/static/js/lib/codemirror/", - stylesheet: "/static/css/xmlcolors.css", - parserConfig: {useHTMLKludges: false}, - textWrapping: false, - tabMode: 'spaces', - indentUnit: 0, - onChange: this.editorDataChanged.bind(this), - initCallback: this.editorDidLoad.bind(this) - }); - }, + this.parent.freeze('Ładowanie edytora...'); + this.editor = new CodeMirror($('.xmlview', this.element).get(0), { + parserfile: 'parsexml.js', + path: "/static/js/lib/codemirror/", + stylesheet: "/static/css/xmlcolors.css", + parserConfig: { + useHTMLKludges: false + }, + textWrapping: false, + tabMode: 'spaces', + indentUnit: 0, + onChange: this.editorDataChanged.bind(this), + initCallback: this.editorDidLoad.bind(this) + }); + }, - resized: function(event) { - var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight(); - $('.xmlview', this.element).height(height); - }, + resized: function(event) { + var height = this.element.height() - $('.xmlview-toolbar', this.element).outerHeight(); + $('.xmlview', this.element).height(height); + }, - reload: function() { - this.model.load(true); - }, + reload: function() { + this.model.load(true); + }, - editorDidLoad: function(editor) { - $(editor.frame).css({width: '100%', height: '100%'}); - this.model - .addObserver(this, 'data', this.modelDataChanged.bind(this)) - .addObserver(this, 'state', this.modelStateChanged.bind(this)) - .load(); + editorDidLoad: function(editor) { + $(editor.frame).css({ + width: '100%', + height: '100%' + }); + this.model + .addObserver(this, 'data', this.modelDataChanged.bind(this)) + .addObserver(this, 'state', this.modelStateChanged.bind(this)) + .load(); - this.parent.unfreeze(); + this.parent.unfreeze(); - this.editor.setCode(this.model.get('data')); - this.modelStateChanged('state', this.model.get('state')); + this.editor.setCode(this.model.get('data')); + this.modelStateChanged('state', this.model.get('state')); - // editor.grabKeys( - // $.fbind(self, self.hotkeyPressed), - // $.fbind(self, self.isHotkey) - // ); - }, + editor.grabKeys( + this.hotkeyPressed.bind(this), + this.isHotkey.bind(this) + ); + }, - editorDataChanged: function() { - this.model.set('data', this.editor.getCode()); - }, + editorDataChanged: function() { + this.model.set('data', this.editor.getCode()); + }, - modelDataChanged: function(property, value) { - if (this.editor.getCode() != value) { - this.editor.setCode(value); - } - }, + modelDataChanged: function(property, value) { + if (this.editor.getCode() != value) { + this.editor.setCode(value); + } + }, - modelStateChanged: function(property, value) { - if (value == 'synced' || value == 'dirty') { - this.unfreeze(); - } else if (value == 'unsynced') { - this.freeze('Niezsynchronizowany...'); - } else if (value == 'loading') { - this.freeze('Ładowanie...'); - } else if (value == 'saving') { - this.freeze('Zapisywanie...'); - } else if (value == 'error') { - this.freeze(this.model.get('error')); - } - }, + modelStateChanged: function(property, value) { + if (value == 'synced' || value == 'dirty') { + this.unfreeze(); + } else if (value == 'unsynced') { + this.freeze('Niezsynchronizowany...'); + } else if (value == 'loading') { + this.freeze('Ładowanie...'); + } else if (value == 'saving') { + this.freeze('Zapisywanie...'); + } else if (value == 'error') { + this.freeze(this.model.get('error')); + } + }, - dispose: function() { - this.model.removeObserver(this); - $(this.editor.frame).remove(); - this._super(); - } + dispose: function() { + this.model.removeObserver(this); + $(this.editor.frame).remove(); + this._super(); + }, + + getHotkey: function(event) { + var code = event.keyCode; + if(!((code >= 97 && code <= 122) + || (code >= 65 && code <= 90)) ) return null; + + var ch = String.fromCharCode(code & 0xff).toLowerCase(); + console.log(ch.charCodeAt(0), '#', buttons); + + var buttons = $('.buttontoolbarview-button[title='+ch+']', this.element); + var mod = 0; + + if(event.altKey) mod |= 0x01; + if(event.ctrlKey) mod |= 0x02; + if(event.shiftKey) mod |= 0x04; + + if(buttons.length) { + var match = null; + + buttons.each(function() { + if( parseInt($(this).attr('ui:hotkey_mod')) == mod ) { + match = this; + return; + } + }) + + return match; + } + else { + return null; + } + }, + + isHotkey: function() { + console.log(arguments); + + if(this.getHotkey.apply(this, arguments)) + return true; + else + return false; + }, + + hotkeyPressed: function() { + var button = this.getHotkey.apply(this, arguments); + this.buttonToolbar.buttonPressed({ + target: button + }); + } + }); +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('+'); +}; + // Register view panels['xml'] = XMLView; diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html index 7d288d3c..edb3bfcd 100644 --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@ -122,7 +122,10 @@