Merge branch 'master' into lqc-trunk

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

diff --git a/platforma/static/js/models.js b/platforma/static/js/models.js
old mode 100644 (file)
new mode 100755 (executable)
index f945238..4052594
--- a/platforma/static/js/models.js
+++ b/platforma/static/js/models.js
@@ -228,7 +228,7 @@ Editor.HTMLModel = Editor.Model.extend({
 
     getXMLPart: function(elem, callback)
     {
 
     getXMLPart: function(elem, callback)
     {

-        var path = elem.attr('wl2o:path');
+        var path = elem.attr('x-pointer');

         if(!this.xmlParts[path])
             this.loadXMLPart(elem, callback);
         else
         if(!this.xmlParts[path])
             this.loadXMLPart(elem, callback);
         else


@@ -237,7 +237,7 @@ Editor.HTMLModel = Editor.Model.extend({
 
     loadXMLPart: function(elem, callback)
     {
 
     loadXMLPart: function(elem, callback)
     {

-        var path = elem.attr('wl2o:path');
+        var path = elem.attr('x-pointer');

         var self = this;
 
         $.ajax({
         var self = this;
 
         $.ajax({


@@ -262,10 +262,10 @@ Editor.HTMLModel = Editor.Model.extend({
         });
     },
 
         });
     },
 

-    putXMLPart: function(elem, data) {
+    putXMLPart: function(elem, data, callback) {

         var self = this;
       
         var self = this;
       

-        var path = elem.attr('wl2o:path');
+        var path = elem.attr('x-pointer');

         this.xmlParts[path] = data;
 
         this.set('state', 'dirty');
         this.xmlParts[path] = data;
 
         this.set('state', 'dirty');


@@ -281,7 +281,7 @@ Editor.HTMLModel = Editor.Model.extend({
                 // format: 'nl'
             },
             success: function(htmldata) {
                 // format: 'nl'
             },
             success: function(htmldata) {

-                elem.html(htmldata);
+                callback(elem, htmldata);

                 self.set('state', 'dirty');
             }
         });
                 self.set('state', 'dirty');
             }
         });


@@ -522,7 +522,7 @@ Editor.DocumentModel = Editor.Model.extend({
                 revision: this.get('revision'),
                 user: this.get('user')
             },
                 revision: this.get('revision'),
                 user: this.get('user')
             },

-            complete: this.updateCompleted.bind(this),            
+            complete: this.updateCompleted.bind(this)           

         });
     },
   
         });
     },
   


@@ -596,10 +596,13 @@ Editor.DocumentModel = Editor.Model.extend({
     mergeCompleted: function(xhr, textStatus) {
         console.log(xhr.status, xhr.responseText);
         var response = parseXHRResponse(xhr);
     mergeCompleted: function(xhr, textStatus) {
         console.log(xhr.status, xhr.responseText);
         var response = parseXHRResponse(xhr);

-        if(response.success)
-        {
-            if( (response.data.result == 'no-op')
-             || (response.data.shared_timestamp == response.data.shared_parent_timestamp))
+        
+        if(response.success) {
+        
+            if( (response.data.result == 'no-op') ||             
+             ( response.data.shared_parent_timestamp
+               && response.data.shared_timestamp
+               && (response.data.shared_timestamp == response.data.shared_parent_timestamp)) )

             {
                 if( (response.data.revision) && (response.data.revision != this.get('revision')) )
                 {
             {
                 if( (response.data.revision) && (response.data.revision != this.get('revision')) )
                 {