Przyciski w dwóch otwartych naraz edytorach XML sobie nie przeszkadzają.

diff --git a/apps/toolbar/templates/toolbar/toolbar.html b/apps/toolbar/templates/toolbar/toolbar.html
index c508929..c6b5ebb 100644 (file)
--- a/apps/toolbar/templates/toolbar/toolbar.html
+++ b/apps/toolbar/templates/toolbar/toolbar.html
@@ -1,14 +1,14 @@
 {% load toolbar_tags %}
 {% load toolbar_tags %}

-<div id="toolbar">
-    <ol id="toolbar-tabs">
+<div class="toolbar">
+    <ol class="toolbar-tabs">

         {% for group in groups %}
         <li p:button-list="{{ group.slug }}" {% if forloop.first %}class="active"{% endif %}>{{ group.name }}</li>
         {% endfor %}
     </ol>
     <div style="clear: both; height: 0; width: 0">&nbsp;</div>
         {% for group in groups %}
         <li p:button-list="{{ group.slug }}" {% if forloop.first %}class="active"{% endif %}>{{ group.name }}</li>
         {% endfor %}
     </ol>
     <div style="clear: both; height: 0; width: 0">&nbsp;</div>

-    <div id="toolbar-buttons">
+    <div class="toolbar-buttons">

         {% for group in groups %}
         {% for group in groups %}

-        <ol id="{{ group.slug }}" {% if not forloop.first %}style="display:none"{% endif %}>
+        <ol class="{{ group.slug }}" {% if not forloop.first %}style="display:none"{% endif %}>

             {% for button in group.button_set.all %}
             <li p:tag="{{ button.tag }}" {% if button.key %}p:key="{{ button.key|keycode }}" title="Alt+{{ button.key|upper }}"{% endif %}>{{ button.label }}</li>
             {% endfor %}
             {% for button in group.button_set.all %}
             <li p:tag="{{ button.tag }}" {% if button.key %}p:key="{{ button.key|keycode }}" title="Alt+{{ button.key|upper }}"{% endif %}>{{ button.label }}</li>
             {% endfor %}

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 88e6583..5912e1e 100644 (file)
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -194,12 +194,12 @@ label {
 /* = XML Editor panel = */
 /* ==================== */
 
 /* = XML Editor panel = */
 /* ==================== */
 

-#toolbar {
+.toolbar {

     height: 48px;
     overflow: hidden;
 }
 
     height: 48px;
     overflow: hidden;
 }
 

-#toolbar, #toolbar ol, #sidebar-toolbar, #sidebar-toolbar ol {
+.toolbar, .toolbar ol {

 /*    overflow: hidden;*/
     display: block;
     margin: 0;
 /*    overflow: hidden;*/
     display: block;
     margin: 0;


@@ -208,15 +208,7 @@ label {
     border-top: 1px solid #AAA;
 }
 
     border-top: 1px solid #AAA;
 }
 

-#sidebar-toolbar {
-    width: 0;
-}
-
-#sidebar-toolbar, #sidebar-toolbar ol {
-    overflow: hidden;
-}
-
-#sidebar-tabs li, #toolbar-tabs li {
+.toolbar-tabs li {

     font-size: 14px;
     display: block;
     float: left;
     font-size: 14px;
     display: block;
     float: left;


@@ -232,24 +224,24 @@ label {
     -webkit-border-top-right-radius: 8px;
 }
 
     -webkit-border-top-right-radius: 8px;
 }
 

-#sidebar-tabs, #toolbar-tabs {
+.toolbar-tabs {

     height: 21px;
     z-index: 1000;
 /*    overflow: hidden;*/
 }
 
     height: 21px;
     z-index: 1000;
 /*    overflow: hidden;*/
 }
 

-#sidebar-tabs li:hover, #sidebar-tabs li.active, #toolbar-tabs li:hover, #toolbar-tabs li.active {
+.toolbar-tabs li:hover, .toolbar-tabs li.active {

     cursor: default;
     background-color: #EEE;
     border-bottom: 1px solid #EEE;
 }
 
     cursor: default;
     background-color: #EEE;
     border-bottom: 1px solid #EEE;
 }
 

-#toolbar-buttons {
+.toolbar-buttons {

     background-color: #EEE;
     border-bottom: 1px solid #AAA;
 }
 
     background-color: #EEE;
     border-bottom: 1px solid #AAA;
 }
 

-#toolbar-buttons li {
+.toolbar-buttons li {

     display: block;
     font-size: 12px;
     padding: 1px 8px;
     display: block;
     font-size: 12px;
     padding: 1px 8px;


@@ -260,7 +252,7 @@ label {
     float: left;
 }
 
     float: left;
 }
 

-#toolbar-buttons li:hover {
+.toolbar-buttons li:hover {

     background-color: #777;
     color: #FFF;
     cursor: default;
     background-color: #777;
     color: #FFF;
     cursor: default;

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 89990a4..f2a6d73 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -7,9 +7,9 @@
 
 <script type="text/javascript" charset="utf-8">
 (function() {
 
 <script type="text/javascript" charset="utf-8">
 (function() {

-    function xmleditor_onload(event, me) {
+    function xmleditor_onload(event, panel) {

         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);
         var textareaId = 'xmleditor-' + Math.ceil(Math.random() * 1000000000);

-        $('textarea', me).attr('id', textareaId);
+        $('textarea', panel).attr('id', textareaId);

         var editor = CodeMirror.fromTextArea(textareaId, {
             parserfile: 'parsexml.js',
             path: "/static/js/codemirror/",
         var editor = CodeMirror.fromTextArea(textareaId, {
             parserfile: 'parsexml.js',
             path: "/static/js/codemirror/",


@@ -17,21 +17,22 @@
             parserConfig: {useHTMLKludges: false},
             initCallback: function() {
                 // Toolbar
             parserConfig: {useHTMLKludges: false},
             initCallback: function() {
                 // Toolbar

-                $('#toolbar-tabs li', panel).click(function() {
+                $('.toolbar-tabs li', panel).click(function() {

                     var id = $(this).attr('p:button-list');
                     var id = $(this).attr('p:button-list');

-                    $('#toolbar-tabs li', panel).removeClass('active');
+                    $('.toolbar-tabs li', panel).removeClass('active');

                     $(this).addClass('active');
                     $(this).addClass('active');

-                    if (!$('#' + id).is(':visible')) {
-                        $('#toolbar-buttons ol', panel).not('#' + id).hide();
-                        $('#' + id, panel).show();
+                    if (!$('.' + id, panel).is(':visible')) {
+                        $('.toolbar-buttons ol', panel).not('#' + id).hide();
+                        $('.' + id, panel).show();

                     }
                 })
                 
                 var keys = {};
                     }
                 })
                 
                 var keys = {};

-                $('#toolbar-buttons li', panel).each(function() {
+                $('.toolbar-buttons li', panel).each(function() {

                     var tag = $(this).attr('p:tag');
                     var handler = function() {
                         var text = editor.selection();
                     var tag = $(this).attr('p:tag');
                     var handler = function() {
                         var text = editor.selection();

+                        console.log(editor, editor.frame);

                         editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
                         if (text.length == 0) {
                             var pos = editor.cursorPosition();
                         editor.replaceSelection('<' + tag + '>' + text + '</' + tag + '>');
                         if (text.length == 0) {
                             var pos = editor.cursorPosition();


@@ -66,7 +67,7 @@
         });
     };
     
         });
     };
     

-    function xmleditor_onunload(event, me) {}
+    function xmleditor_onunload(event, panel) {}

     
     panel(xmleditor_onload, xmleditor_onunload);
 })();
     
     panel(xmleditor_onload, xmleditor_onunload);
 })();