Poprawione tooltipy i skróty klawiszowe.

[redakcja.git] / project / templates / explorer / panels / xmleditor.html

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 2253609..39a05e5 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -1,14 +1,17 @@
 {% load toolbar_tags %}
 
 {% load toolbar_tags %}
 

-{% toolbar %}

 <div class="change-font-size" style="">
     <div class="decrease-font-size">A<sup>-</sup></div>
     <div class="increase-font-size">A<sup>+</sup></div>
 </div>
 <div class="change-font-size" style="">
     <div class="decrease-font-size">A<sup>-</sup></div>
     <div class="increase-font-size">A<sup>+</sup></div>
 </div>

-<div class="iframe-container" style="position: absolute; top: 48px; left:0px; right:0px; bottom: 0px;">
+
+<div class="iframe-container" style="position: absolute; top: 41pt; left:0px; right:0px; bottom: 0px;">

        <textarea name="text">{{ text }}</textarea>
 </div>
 
        <textarea name="text">{{ text }}</textarea>
 </div>
 

+
+{% toolbar %}
+

 <script type="text/javascript" charset="utf-8">
 
 panel_hooks = {
 <script type="text/javascript" charset="utf-8">
 
 panel_hooks = {


@@ -19,64 +22,27 @@ panel_hooks = {
         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
                $('textarea', panel).attr('id', textareaId);
 
         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
                $('textarea', panel).attr('id', textareaId);
 

-               var texteditor = CodeMirror.fromTextArea(textareaId, {
+       var texteditor = CodeMirror.fromTextArea(textareaId, {

             parserfile: 'parsexml.js',
             parserfile: 'parsexml.js',

-            path: "/static/js/codemirror/",
-            stylesheet: "/static/css/xmlcolors.css",
+            path: "{{STATIC_URL}}js/codemirror/",
+            stylesheet: "{{STATIC_URL}}css/xmlcolors.css",

             parserConfig: {useHTMLKludges: false},
             onChange: function() {
             parserConfig: {useHTMLKludges: false},
             onChange: function() {

-                               panel.trigger('panel:contentChanged', self);
+               self.fireEvent('contentChanged');

             },
             initCallback: function(editor) {
             },
             initCallback: function(editor) {

-                // Toolbar
-                $('.toolbar-tabs li', panel).click(function() {
-                    var id = $(this).attr('p:button-list');
-                    $('.toolbar-tabs li', panel).removeClass('active');
-                    $(this).addClass('active');
-                    if (!$('.' + id, panel).is(':visible')) {
-                        $('.toolbar-buttons ol', panel).not('#' + id).hide();
-                        $('.' + id, panel).show();
-                    }
-                })
-                
-                var keys = {};
-                $('.toolbar-buttons li', panel).each(function() {
-                    var tag = $(this).attr('p:tag');
-                    var handler = function() {
-                        var text = texteditor.selection();
-                        editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
-                        if (text.length == 0) {
-                            var pos = texteditor.cursorPosition();
-                            texteditor.selectLines(pos.line, pos.character + tag.length + 2);
-                        }
-                        $(document).trigger('panel:contentChanged', self);
-                    }
-                    if ($(this).attr('p:key')) {
-                        keys[$(this).attr('p:key')] = handler;
-                    }
-                    $(this).click(handler)
-                });
-
-                texteditor.grabKeys(function(event) { 
-                    if (keys[event.keyCode]) {
-                        keys[event.keyCode]();
-                    }
-                }, function(event) { return event.altKey && keys[event.keyCode]; });
+                // Editor is loaded
+                // Buttons are connected
+                // register callbacks for actions
+                texteditor.grabKeys(
+                    $.fbind(self, self.hotkeyPressed),
+                    $.fbind(self, self.isHotkey) );

             }
         })
         
         $(texteditor.frame).css({width: '100%', height: '100%'});
         
             }
         })
         
         $(texteditor.frame).css({width: '100%', height: '100%'});
         

-        $('#toolbar-buttons li').wTooltip({
-            delay: 1000, 
-            style: {
-                border: "1px solid #7F7D67",
-                opacity: 0.9, 
-                background: "#FBFBC6", 
-                padding: "1px",
-                fontSize: "12px",
-            }
-        });
+        

 
         $('.decrease-font-size', panel).click(function() {
             var frameBody = $('body', $(texteditor.frame).contents());
 
         $('.decrease-font-size', panel).click(function() {
             var frameBody = $('body', $(texteditor.frame).contents());


@@ -88,9 +54,8 @@ panel_hooks = {
             var frameBody = $('body', $(texteditor.frame).contents());
             console.log(frameBody.css('font-size'));
             frameBody.css('font-size', parseInt(frameBody.css('font-size')) + 2);
             var frameBody = $('body', $(texteditor.frame).contents());
             console.log(frameBody.css('font-size'));
             frameBody.css('font-size', parseInt(frameBody.css('font-size')) + 2);

-        });
-        
-               this.texteditor = texteditor;
+        });        
+        this.texteditor = texteditor;

     },
 
        unload: function() { 
     },
 
        unload: function() {