From: zuber <marek@stepniowski.com>
Date: Mon, 24 Aug 2009 14:28:13 +0000 (+0200)
Subject: Panel z widokiem HTML reaguje na zmiany w panelu z edytorem XML.
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/51a4b0a4a2aad9b17eb9b6c5d71bb67677e20b50?hp=76a7781f806775f0b29c50ab8937e4dd64807830

Panel z widokiem HTML reaguje na zmiany w panelu z edytorem XML.
---

diff --git a/project/static/css/master.css b/project/static/css/master.css
index 5912e1e7..76a56325 100644
--- a/project/static/css/master.css
+++ b/project/static/css/master.css
@@ -272,3 +272,6 @@ div.isection p {
 	margin: 0.5em 1em;
 }
 
+.change-notification {
+    color: red;
+}
diff --git a/project/static/js/panels.js b/project/static/js/panels.js
index 0c8761c8..28970c17 100644
--- a/project/static/js/panels.js
+++ b/project/static/js/panels.js
@@ -1,5 +1,6 @@
 function loadPanel(target, url) {
     console.log('ajax', url, 'into', target);
+    $('.change-notification', $(target).parent()).fadeOut();
     $(document).trigger('panel:unload', target);
     $.ajax({
         url: url,
@@ -9,7 +10,6 @@ function loadPanel(target, url) {
             $(target).html(data);
             console.log(target, 'triggering panel:load');
             $(document).trigger('panel:load', target);
-            // panel(target);
         },
         error: function(request, textStatus, errorThrown) {
             console.log('ajax', url, target, 'error:', textStatus, errorThrown);
diff --git a/project/templates/explorer/file_xml.html b/project/templates/explorer/file_xml.html
index eb180157..a109f93b 100644
--- a/project/templates/explorer/file_xml.html
+++ b/project/templates/explorer/file_xml.html
@@ -15,23 +15,26 @@
         <div id="panels">
             <div id="left-panel-wrap" class="panel-wrap">
                <div id="left-panel-toolbar" class="panel-toolbar">
-                            <label for="select-left-panel">Lewy panel:</label>
-                            <select name="select-left-panel" id="select-left-panel">
-                                <option value="{% url xmleditor_panel hash %}">Edytor XML</option>
-                                <option value="{% url htmleditor_panel hash %}">Edytor HTML</option>
-                            <option value="{% url gallery_panel hash %}">Galeria skanów</option>                                   		</select>
+                    <label for="select-left-panel">Lewy panel:</label>
+                    <select name="select-left-panel" id="select-left-panel">
+                        <option value="{% url xmleditor_panel hash %}">Edytor XML</option>
+                        <option value="{% url htmleditor_panel hash %}">Edytor HTML</option>
+                        <option value="{% url gallery_panel hash %}">Galeria skanów</option>    
+                    </select>
+                    <strong class="change-notification" style="display: none">Zmieniono!</strong>
                </div>
                <div id="left-panel-content" class="panel-content"></div>
                <button class="panel-slider">&nbsp;</button>
             </div>
             <div id="right-panel-wrap" class="panel-wrap last-panel">
                 <div id="right-panel-toolbar" class="panel-toolbar">
-                	<label for="select-right-panel">Prawy panel:</label>
+                    <label for="select-right-panel">Prawy panel:</label>
                     <select name="select-right-panel" id="select-right-panel">
-                            <option value="{% url xmleditor_panel hash %}">Edytor XML</option>
-                            <option value="{% url htmleditor_panel hash %}">Edytor HTML</option>
-                            <option value="{% url gallery_panel hash %}">Galeria skanów</option>
+                        <option value="{% url xmleditor_panel hash %}">Edytor XML</option>
+                        <option value="{% url htmleditor_panel hash %}">Edytor HTML</option>
+                        <option value="{% url gallery_panel hash %}">Galeria skanów</option>
                     </select>
+                    <strong class="change-notification" style="display: none">Zmieniono!</strong>
                  </div>
                  <div id="right-panel-content" class="panel-content"></div>
             </div>
diff --git a/project/templates/explorer/panels/htmleditor.html b/project/templates/explorer/panels/htmleditor.html
index 0eab0b28..3b1791e1 100644
--- a/project/templates/explorer/panels/htmleditor.html
+++ b/project/templates/explorer/panels/htmleditor.html
@@ -5,14 +5,14 @@
 </div>
 <script type="text/javascript" charset="utf-8">
     (function() {
-        function resizeEditor(event, panel) {
-            var panel = panel || event.data.panel;
-            $('.htmleditor', panel).height($(panel).height());
-        }
-
+        var id = Math.ceil(Math.random() * 1000000000);
+        
         panel(function(event, panel) {
-            $(window).bind('resize', {'panel': panel}, resizeEditor);
-            resizeEditor(null, panel);  
-        }, function(event, panel) {});
+            $(document).bind('panel:contentChanged.' + id, function(event, p) {
+                $('.change-notification', $(panel).parent()).fadeIn();
+            })
+        }, function(event, panel) {
+            $(document).unbind('panel:contentChanged.' + id);
+        });
     })()
 </script>
\ No newline at end of file
diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index f2a6d733..bb225e4c 100644
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -15,7 +15,10 @@
             path: "/static/js/codemirror/",
             stylesheet: "/static/css/xmlcolors.css",
             parserConfig: {useHTMLKludges: false},
-            initCallback: function() {
+            onChange: function() {
+                $(document).trigger('panel:contentChanged', panel);
+            },
+            initCallback: function(editor) {
                 // Toolbar
                 $('.toolbar-tabs li', panel).click(function() {
                     var id = $(this).attr('p:button-list');
@@ -38,6 +41,7 @@
                             var pos = editor.cursorPosition();
                             editor.selectLines(pos.line, pos.character + tag.length + 2);
                         }
+                        $(document).trigger('panel:contentChanged', panel);
                     }
                     if ($(this).attr('p:key')) {
                         keys[$(this).attr('p:key')] = handler;