Podwyższenie wymaganej wersji biblioteki librarian do 1.2.6.

[redakcja.git] / project / static / js / models.js

diff --git a/project/static/js/models.js b/project/static/js/models.js
index e2ee8b1..ab021f5 100644 (file)
--- a/project/static/js/models.js
+++ b/project/static/js/models.js
@@ -23,7 +23,15 @@ Editor.ToolbarButtonsModel = Editor.Model.extend({
         }
     },
   
         }
     },
   

-    loadSucceeded: function(data) {
+    loadSucceeded: function(data)
+    {
+        // do some escaping
+        $.each(data, function() {
+            $.each(this.buttons, function() {
+                //do some lame escapes
+                this.tooltip = this.tooltip.replace(/"/g, """);
+            });
+        });

         this.set('buttons', data);
     }
 });
         this.set('buttons', data);
     }
 });


@@ -176,7 +184,7 @@ Editor.HTMLModel = Editor.Model.extend({
             this.set('state', 'loading');
 
             // load the transformed data
             this.set('state', 'loading');
 
             // load the transformed data

-            messageCenter.addMessage('info', 'Wczytuję HTML...');
+            // messageCenter.addMessage('info', 'Wczytuję HTML...');

 
             $.ajax({
                 url: this.htmlURL,
 
             $.ajax({
                 url: this.htmlURL,


@@ -196,16 +204,42 @@ Editor.HTMLModel = Editor.Model.extend({
         }
         this.set('data', data);
         this.set('state', 'synced');
         }
         this.set('data', data);
         this.set('state', 'synced');

-        messageCenter.addMessage('success', 'Wczytałem HTML :-)');
+        // messageCenter.addMessage('success', 'Wczytałem HTML :-)');

     },
   
     },
   

-    loadingFailed: function() {
+    loadingFailed: function(response) {

         if (this.get('state') != 'loading') {
             alert('erroneous state:', this.get('state'));
         }
         if (this.get('state') != 'loading') {
             alert('erroneous state:', this.get('state'));
         }

-        this.set('error', 'Nie udało się załadować panelu');
+
+        var json_response = null;
+        var message = "";
+
+        try {
+            json_response = $.evalJSON(response.responseText);
+
+            if(json_response.reason == 'xml-parse-error') {
+
+                message = json_response.message.replace(/(line\s+)(\d+)(\s+)/i,
+                    "<a class='xml-editor-ref' href='#xml-$2-1'>$1$2$3</a>");
+
+                message = message.replace(/(line\s+)(\d+)(\,\s*column\s+)(\d+)/i,
+                    "<a class='xml-editor-ref' href='#xml-$2-$4'>$1$2$3$4</a>");
+
+                
+            }
+            else {
+                message = json_response.message || json_response.reason || "nieznany błąd.";
+            }
+        }
+        catch (e) {
+            message = response.statusText;
+        }
+
+        this.set('error', '<p>Nie udało się wczytać widoku HTML: </p>' + message);
+

         this.set('state', 'error');
         this.set('state', 'error');

-        messageCenter.addMessage('error', 'Nie udało mi się wczytać HTML. Spróbuj ponownie :-(');
+        // messageCenter.addMessage('error', 'Nie udało mi się wczytać HTML. Spróbuj ponownie :-(');

     },
 
     getXMLPart: function(elem, callback)
     },
 
     getXMLPart: function(elem, callback)


@@ -224,7 +258,7 @@ Editor.HTMLModel = Editor.Model.extend({
 
         $.ajax({
             url: this.dataURL,
 
         $.ajax({
             url: this.dataURL,

-            dataType: 'text; charset=utf-8',
+            dataType: 'text',

             data: {
                 revision: this.get('revision'),
                 part: path
             data: {
                 revision: this.get('revision'),
                 part: path


@@ -548,12 +582,12 @@ $(function()
     toolbarUrl = $('#api-toolbar-url').text();
 
     doc = new Editor.DocumentModel();
     toolbarUrl = $('#api-toolbar-url').text();
 
     doc = new Editor.DocumentModel();

-    var editor = new EditorView('#body-wrap', doc);
-    editor.freeze();

 
 

-    var flashView = new FlashView('#flashview', messageCenter);
-    var splitView = new SplitView('#splitview', doc);
+    EditorView = new EditorView('#body-wrap', doc);
+    EditorView.freeze();

 
     leftPanelView = new PanelContainerView('#left-panel-container', doc);
     rightPanelContainer = new PanelContainerView('#right-panel-container', doc);
 
     leftPanelView = new PanelContainerView('#left-panel-container', doc);
     rightPanelContainer = new PanelContainerView('#right-panel-container', doc);

+
+    var flashView = new FlashView('#flashview', messageCenter);   

 });
 });