Altered javascript to support new packet-based saving.

joedeveloper · Oct 21, 2010 · 3872857 · 3872857
1 parent 93bb4e2
commit 3872857
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/apps/widget/rpc.py b/apps/widget/rpc.py
@@ -111,6 +111,7 @@ def finished_subtitles(self, request, video_id, packets, language_code=None):
 
         Action.create_caption_handler(last_version)
         return { "response" : "ok",
+                 "last_saved_packet": last_version.last_saved_packet,
                  "drop_down_contents" : 
                      self._drop_down_contents(request.user, video) }
 

diff --git a/media/js/widget/subtitle/editablecaption.js b/media/js/widget/subtitle/editablecaption.js
@@ -191,6 +191,15 @@ mirosubs.subtitle.EditableCaption.prototype.changed_ =
         new mirosubs.subtitle.EditableCaption.ChangeEvent(
             timesFirstAssigned));
 };
+mirosubs.subtitle.EditableCaption.toJsonArray = function(editableCaptions) {
+    return goog.array.map(arr, function(editableCaption) {
+        return editableCaption.json;
+    });
+};
+
+/**
+ * @constructor
+ */
 mirosubs.subtitle.EditableCaption.ChangeEvent = function(timesFirstAssigned) {
     this.type = mirosubs.subtitle.EditableCaption.CHANGE;
     this.timesFirstAssigned = timesFirstAssigned;

diff --git a/media/js/widget/subtitle/msservermodel.js b/media/js/widget/subtitle/msservermodel.js
@@ -39,6 +39,8 @@ mirosubs.subtitle.MSServerModel = function(videoID, videoURL, language) {
     this.language_ = language;
     this.initialized_ = false;
     this.finished_ = false;
+    this.unsavedPackets_ = [];
+    this.packetNo_ = 1;
 };
 goog.inherits(mirosubs.subtitle.MSServerModel, goog.Disposable);
 
@@ -137,23 +139,34 @@ mirosubs.subtitle.MSServerModel.prototype.saveImpl_ = function() {
                 // this should never happen.
                 alert('Problem saving subtitles. Response: ' + 
                       result['response']);
+            else
+                this.registerSavedPackets_(result['last_saved_packet']);
         });
 };
 
+mirosubs.subtitle.MSServerModel.prototype.registerSavedPackets_ = function(lastSavedPacketNo) {
+    var saved = goog.array.filter(
+        this.unsavedPackets_,
+        function(p) { return p['packet_no'] < lastSavedPacketNo; });
+    for (var i = 0; i < saved.length; i++)
+        goog.array.remove(unsavedPackets_, saved[i]);
+};
+
 mirosubs.subtitle.MSServerModel.prototype.makeSaveArgs_ = function() {
     var work = this.unitOfWork_.getWork();
     this.unitOfWork_.clear();
-    var toJsonCaptions = function(arr) {
-        return goog.array.map(arr, function(editableCaption) {
-                return editableCaption.json;
-            });
+    var packet = {
+        'packet_no': this.packetNo_,
+        'deleted': toJsonCaptions(work.deleted),
+        'inserted': toJsonCaptions(work.neu),
+        'updated': toJsonCaptions(work.updated)
     };
+    this.packetNo_++;
+    this.unsavedPackets_.push(packet);
     return {
         'video_id': this.videoID_,
         'language_code': this.language_,
-        'deleted': toJsonCaptions(work.deleted),
-        'inserted': toJsonCaptions(work.neu),
-        'updated': toJsonCaptions(work.updated)
+        'packets': this.unsavedPackets_
     };
 };