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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js
r29885 r29888 28 28 29 29 var hasLocalStorage = (typeof(Storage) !== "undefined"); 30 var trackEditor = null; 30 31 31 32 function initialiseMediaPlayer() { … … 86 87 87 88 function togglePlayPause() { 89 //e = e || window.event; 88 90 // If the mediaPlayer is currently paused or has ended 89 91 console.log("togglePlayPause()"); 92 93 //console.log("**** event e = " + e); 94 90 95 //console.log("*** mediaPlayer (paused,ended): (" + mediaPlayer.paused + "," + mediaPlayer.ended + ")"); 91 96 //console.log("*** currentTime = " + mediaPlayer.currentTime); … … 129 134 console.log("*** mediaPlayedNotes = " + JSON.stringify(mediaPlayedNotes)); 130 135 } 136 137 // Loose keyboard focus so space-bar for global pause doesn't cause a focused play-button event 138 $('#play-pause-button').blur(); 139 140 131 141 } 132 142 … … 312 322 var docOID = gs.cgiParams.d; 313 323 314 var docStorageStr = localStorage.getItem(docOID); 315 var docStorage = (docStorageStr != null) ? eval("("+docStorageStr+")") : {palTracks:{}, popTracks:{}}; 324 325 // Force reset of what has been stored for this item 326 //localStorage.setItem(docOID, JSON.stringify(null)); 327 328 var docStorage = getDocStorage(docOID); 329 330 //var docStorageStr = localStorage.getItem(docOID); 331 //console.log("*** retrived docStorageStr: " + JSON.stringify(docStorage)); 332 333 //// var docStorage = (docStorageStr != null) ? eval("("+docStorageStr+")") : {palTracks:{}, popTracks:{}}; 334 //var docStorage = eval("("+docStorageStr+")") || {palTracks:{}, popTracks:{}}; 335 //console.log("*** set up docStorage: " + JSON.stringify(docStorage)); 316 336 317 337 var palTracks = docStorage.palTracks; … … 343 363 } 344 364 365 var cb_name = save_name.replace(/[ -]/g,""); 366 var cb_value = save_name; 367 var name = save_name; 368 369 $('#palList').append('<div id="pal'+cb_name+'"><input type="checkbox" ' 370 + '" name="'+cb_name+'" value="' + cb_value + '"' 371 + ' checked="checked">' 372 + name + '</div>'); 345 373 346 374 var $dialog = $('#save-recording-popup'); … … 363 391 show: { 364 392 effect: "blind", 365 duration: 1000393 duration: 800 366 394 }, 367 395 hide: { 368 396 effect: "blind", 369 duration: 500397 duration: 300 370 398 }, 371 399 … … 387 415 388 416 417 var delete_dialog = $('#delete-recording-popup').dialog({ 418 resizable: false, 419 autoOpen: false, 420 width: 500, 421 height:200, 422 modal: true, 423 424 show: { 425 effect: "blind", 426 duration: 800 427 }, 428 hide: { 429 effect: "blind", 430 duration: 300 431 }, 432 433 buttons: { 434 "Delete selected items": function() { 435 // call delete 436 palDeleteConfirmed(); 437 $( this ).dialog( "close" ); 438 }, 439 Cancel: function() { 440 $( this ).dialog( "close" ); 441 } 442 } 443 }); 444 445 446 var edit_dialog = $('#edit-recording-popup').dialog({ 447 resizable: true, 448 autoOpen: false, 449 width: 800, 450 height:600, 451 modal: true, 452 453 show: { 454 effect: "blind", 455 duration: 800 456 }, 457 hide: { 458 effect: "blind", 459 duration: 300 460 }, 461 462 buttons: { 463 "Save": function() { 464 // call delete 465 palSave(); 466 $( this ).dialog( "close" ); 467 }, 468 Cancel: function() { 469 $( this ).dialog( "close" ); 470 } 471 } 472 }); 473 474 trackEditor = ace.edit("trackEditor"); 475 trackEditor.getSession().setMode("ace/mode/json"); 476 trackEditor.getSession().setUseSoftTabs(false); 477 var UndoManager = require("ace/undomanager").UndoManager; 478 trackEditor.getSession().setUndoManager(new UndoManager()); 479 480 389 481 }); 390 482
Note:
See TracChangeset
for help on using the changeset viewer.