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

Timestamp:

2015-08-04T13:50:35+12:00 (9 years ago)

Author:

davidb

Message:

Development work done in at JCDL

File:

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

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

@@ -47 +47 @@
 
     // Hide the browser's default controls
-    mediaPlayer.controls = false;
-    
+        mediaPlayer.controls = false;
+
+        // Make the default volume a little bit quiter, so instruments can be heard over it
+        mediaPlayer.volume = 0.3
+    
     // Add a listener for the timeupdate event so we can update the progress bar
     mediaPlayer.addEventListener('timeupdate', updateProgressBar, false);
@@ -343 +346 @@
         //console.log("*** set up docStorage: " + JSON.stringify(docStorage));
 
-        var palTracks = docStorage.palTracks;
+        var palTracks = getPalTracks(docOID);
         
         // Make timing information relative to ba base value
@@ -362 +365 @@
         palTracks[save_name] = [ { name: save_name + " 1", baseCTime: base_time_sct, events: recordedNotesArray } ]
 
-        console.log("Storing " + num_rec_notes + " recorded notes as layer '" + save_name +"'");
-        console.log("**** saved: " + JSON.stringify(palTracks[save_name]));
-
-        localStorage.setItem(docOID, JSON.stringify(docStorage));
+        //console.log("Storing " + num_rec_notes + " recorded notes as layer '" + save_name +"'");
+        //console.log("**** saved: " + JSON.stringify(palTracks[save_name]));
+
+        //localStorage.setItem(docOID, JSON.stringify(docStorage));
+
     }
     else {
-        console.log("Warning: unable to save '" + save_name +"' as browser does not support LocalStorage");
-    }
-
+        //console.log("Warning: unable to save '" + save_name +"' as browser does not support LocalStorage");
+    }
+
+    saveDocStorage("saveRecording()");
+          
     var cb_name = save_name.replace(/[ -]/g,"");
     var cb_value = save_name;
@@ -386 +392 @@
     return valid;
 }
+
+
+function saveNewOverlay()
+{
+    var valid = true;
+
+    var $save_name_input = $("#create-info-name");
+    var save_name = $save_name_input.val();
+    
+    if (save_name.match(/^\s*$/)) {
+    valid = false;
+    $save_name_input.addClass( "ui-state-error" );
+    }
+    else {
+
+    if (hasLocalStorage) {
+        var docOID = gs.cgiParams.d;
+
+
+        // Force reset of what has been stored for this item
+        //localStorage.setItem(docOID, JSON.stringify(null));
+
+        var docStorage = getDocStorage(docOID);
+
+        var popTracks = getPopTracks(docOID);
+
+        var template_webvtt;
+        template_webvtt = "WEBVTT\n";
+        template_webvtt += "\n";
+        template_webvtt += "NOTE Example Popup Info Nugget\n";
+        template_webvtt += "\n";
+        template_webvtt += "CueId1\n";
+        template_webvtt += "00:00.000 --> 00:2.000\n";
+        template_webvtt += "{\n";
+        template_webvtt += "\"title\": \"My First Title\",\n";
+        template_webvtt += "\"text\": \"My first info nugget text\",\n";
+        template_webvtt += "\"xpos\": \"10px\",\n";
+        template_webvtt += "\"ypos\": \"30px\"\n";
+        template_webvtt += "}\n";
+        template_webvtt += "\n";
+
+        popTracks[save_name] = [ template_webvtt ]; // Set up new entry, with exemplar webVTT entry
+
+        //console.log("Storing " + num_rec_notes + " recorded notes as layer '" + save_name +"'");
+        //console.log("**** saved: " + JSON.stringify(palTracks[save_name]));
+
+        //localStorage.setItem(docOID, JSON.stringify(docStorage));
+
+    }
+    else {
+        //console.log("Warning: unable to save '" + save_name +"' as browser does not support LocalStorage");
+    }
+
+    //console.log("***### pop mode, skipping saving for now");
+    saveDocStorage("saveNewOverlay()");
+          
+    var cb_name = save_name.replace(/[ -]/g,"");
+    var cb_value = save_name;
+    var name     = save_name;
+
+    $('#popList').append('<div id="pop'+cb_name+'"><input type="checkbox" '
+                 + '" name="'+cb_name+'" value="' + cb_value + '"'
+                 + ' checked="checked">' 
+                 + name + '</div>');
+
+    var $dialog = $('#create-info-popup');
+    $dialog.dialog( "close" );
+    }
+
+    return valid;
+}
+
 
 
@@ -417 +495 @@
     }
     });
-
+    dialog.parent().css("z-index",999);
+    
     var form = dialog.find( "form" ).on( "submit", function( event ) {
     event.preventDefault();
@@ -450 +529 @@
     }
     });
-
+    delete_dialog.parent().css("z-index",999);
 
     var edit_dialog = $('#edit-recording-popup').dialog({
@@ -479 +558 @@
     }
     });
-
+    edit_dialog.parent().css("z-index",999);
+    
     trackEditor = ace.edit("trackEditor");
     trackEditor.getSession().setMode("ace/mode/json");
@@ -486 +566 @@
     trackEditor.getSession().setUndoManager(new UndoManager());
 
+    //
+    // Pop layer overlays
+    //
+
+    var new_info_dialog = $('#create-info-popup').dialog({
+    width : 500,
+    height: 350,
+    autoOpen: false, // Do not open on page load
+    modal: true,     // Freeze the background behind the overlay
+
+    show: {
+            effect: "blind",
+            duration: 800
+    },
+    hide: {
+            effect: "blind",
+            duration: 300
+    },
+
+    buttons: {
+            "Create Overlay": saveNewOverlay,
+            Cancel: function() {
+        $(this).dialog("close");
+            }
+    },
+    close: function() {
+            form[0].reset();
+            $( "#create-info-name" ).removeClass( "ui-state-error" );
+    }
+    });
+    new_info_dialog.parent().css("z-index",999);
+
+    var info_delete_dialog = $('#delete-info-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
+        popDeleteConfirmed();
+        $( this ).dialog( "close" );
+            },
+            Cancel: function() {
+        $( this ).dialog( "close" );
+            }
+    }
+    });
+    info_delete_dialog.parent().css("z-index",999);
+
+
+    var info_edit_dialog = $('#edit-info-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
+        popSave();
+        $( this ).dialog( "close" );
+            },
+            Cancel: function() {
+        $( this ).dialog( "close" );
+            }
+    }
+    });
+    info_edit_dialog.parent().css("z-index",999);
+    
+    infoEditor = ace.edit("infoEditor");
+    infoEditor.getSession().setMode("ace/mode/text");
+    infoEditor.getSession().setUseSoftTabs(false);
+    var InfoUndoManager = require("ace/undomanager").UndoManager;
+    infoEditor.getSession().setUndoManager(new UndoManager());
+
+
+
+    
 
 });