Changeset 29888 for main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js

Timestamp:

2015-05-17T11:17:31+12:00 (9 years ago)

Author:

davidb

Message:

Working popup editor, saving to localStorage. Tidy up on space-bar for global pause and start play.

File:

• main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js (modified) (7 diffs)

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js

@@ -28 +28 @@
 
 var hasLocalStorage = (typeof(Storage) !== "undefined");
+var trackEditor = null;
 
 function initialiseMediaPlayer() {
@@ -86 +87 @@
 
 function togglePlayPause() {
+    //e = e || window.event;
     // If the mediaPlayer is currently paused or has ended
     console.log("togglePlayPause()");
+
+    //console.log("**** event e = " + e);
+
     //console.log("*** mediaPlayer (paused,ended): (" + mediaPlayer.paused + "," + mediaPlayer.ended + ")");
     //console.log("*** currentTime = " + mediaPlayer.currentTime);
@@ -129 +134 @@
         console.log("*** mediaPlayedNotes = " + JSON.stringify(mediaPlayedNotes));
     }
+
+    // Loose keyboard focus so space-bar for global pause doesn't cause a focused play-button event
+    $('#play-pause-button').blur();
+
+
 }
 
@@ -312 +322 @@
         var docOID = gs.cgiParams.d;
 
-        var docStorageStr = localStorage.getItem(docOID);
-        var docStorage = (docStorageStr != null) ? eval("("+docStorageStr+")") : {palTracks:{}, popTracks:{}};
+
+        // Force reset of what has been stored for this item
+        //localStorage.setItem(docOID, JSON.stringify(null));
+
+        var docStorage = getDocStorage(docOID);
+
+        //var docStorageStr = localStorage.getItem(docOID);
+        //console.log("*** retrived docStorageStr: " + JSON.stringify(docStorage));
+
+        //// var docStorage = (docStorageStr != null) ? eval("("+docStorageStr+")") : {palTracks:{}, popTracks:{}};
+        //var docStorage = eval("("+docStorageStr+")") || {palTracks:{}, popTracks:{}};
+        //console.log("*** set up docStorage: " + JSON.stringify(docStorage));
 
         var palTracks = docStorage.palTracks;
@@ -343 +363 @@
     }
 
+    var cb_name = save_name.replace(/[ -]/g,"");
+    var cb_value = save_name;
+    var name     = save_name;
+
+    $('#palList').append('<div id="pal'+cb_name+'"><input type="checkbox" '
+                 + '" name="'+cb_name+'" value="' + cb_value + '"'
+                 + ' checked="checked">' 
+                 + name + '</div>');
 
     var $dialog = $('#save-recording-popup');
@@ -363 +391 @@
     show: {
             effect: "blind",
-            duration: 1000
+            duration: 800
     },
     hide: {
             effect: "blind",
-            duration: 500
+            duration: 300
     },
 
@@ -387 +415 @@
  
 
+    var delete_dialog = $('#delete-recording-popup').dialog({
+    resizable: false,
+    autoOpen: false, 
+    width: 500,
+    height:200,
+    modal: true,
+
+    show: {
+            effect: "blind",
+            duration: 800
+    },
+    hide: {
+            effect: "blind",
+            duration: 300
+    },
+
+    buttons: {
+            "Delete selected items": function() {
+        // call delete
+        palDeleteConfirmed();
+        $( this ).dialog( "close" );
+            },
+            Cancel: function() {
+        $( this ).dialog( "close" );
+            }
+    }
+    });
+
+
+    var edit_dialog = $('#edit-recording-popup').dialog({
+    resizable: true,
+    autoOpen: false, 
+    width: 800,
+    height:600,
+    modal: true,
+
+    show: {
+            effect: "blind",
+            duration: 800
+    },
+    hide: {
+            effect: "blind",
+            duration: 300
+    },
+
+    buttons: {
+            "Save": function() {
+        // call delete
+        palSave();
+        $( this ).dialog( "close" );
+            },
+            Cancel: function() {
+        $( this ).dialog( "close" );
+            }
+    }
+    });
+
+    trackEditor = ace.edit("trackEditor");
+    trackEditor.getSession().setMode("ace/mode/json");
+    trackEditor.getSession().setUseSoftTabs(false);
+    var UndoManager = require("ace/undomanager").UndoManager;
+    trackEditor.getSession().setUndoManager(new UndoManager());
+
+
 });