From 2ea20862fcef773d4262c78835b16fb5827ecfe2 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Fri, 30 Dec 2011 17:06:29 +0100 Subject: [PATCH 01/11] gallery fixes --- apps/gallery/css/styles.css | 7 +++++++ apps/gallery/lib/scanner.php | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css index 09f9daeb6b..53c3c0901d 100644 --- a/apps/gallery/css/styles.css +++ b/apps/gallery/css/styles.css @@ -17,7 +17,14 @@ div#gallery_album_box { padding: 10px; border: solid 1px black; position: relative; + overflow: hidden; + color: #999; } + +div#gallery_album_box:hover { + color: black; +} + .leftcontent div#gallery_album_box { margin: 5px; } diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php index ef21032796..59c34b8e69 100644 --- a/apps/gallery/lib/scanner.php +++ b/apps/gallery/lib/scanner.php @@ -21,7 +21,9 @@ class OC_Gallery_Scanner { public static function scanDir($path, &$albums) { $current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array()); $current_album['name'] = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $current_album['name'])); - $current_album['name'] = ($current_album['name']==='')?'main':$current_album['name']; + $current_album['name'] = ($current_album['name']==='') ? + 'main' : + trim($current_album['name'],'.'); if ($dh = OC_Filesystem::opendir($path)) { while (($filename = readdir($dh)) !== false) { From 31663cfff5c32b90bf41c6af46f3042db8699fe2 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Fri, 30 Dec 2011 17:47:14 +0100 Subject: [PATCH 02/11] contacts entry duplication fix --- apps/contacts/templates/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index 9e63b20198..90143f25fa 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -1,5 +1,5 @@ Date: Fri, 30 Dec 2011 20:38:56 +0100 Subject: [PATCH 03/11] Include PostgreSQL when checking for available database drivers. Signed-off-by: Brice Maron --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 0f79948bc2..9cf78da6e9 100644 --- a/lib/util.php +++ b/lib/util.php @@ -175,8 +175,8 @@ class OC_Util { $errors=array(); //check for database drivers - if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){ - $errors[]=array('error'=>'No database drivers (sqlite or mysql) installed.
','hint'=>'');//TODO: sane hint + if(!is_callable('sqlite_open') and !is_callable('mysql_connect') and !is_callable('pg_connect')){ + $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
','hint'=>'');//TODO: sane hint } $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); $CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" ); From 64a24191a3880af5b8c574eb2482d479f9024677 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 14:04:16 -0500 Subject: [PATCH 04/11] Fix return for empty Shared folder in opendir() --- apps/files_sharing/sharedstorage.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php index d78e273bf3..b0eaeecf72 100644 --- a/apps/files_sharing/sharedstorage.php +++ b/apps/files_sharing/sharedstorage.php @@ -79,20 +79,16 @@ class OC_Filestorage_Shared extends OC_Filestorage { if ($path == "" || $path == "/") { $path = $this->datadir.$path; $sharedItems = OC_Share::getItemsInFolder($path); - if (empty($sharedItems)) { - return false; - } else { - global $FAKEDIRS; - $files = array(); - foreach ($sharedItems as $item) { - // If item is in the root of the shared storage provider and the item exists add it to the fakedirs - if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) { - $files[] = basename($item['target']); - } + global $FAKEDIRS; + $files = array(); + foreach ($sharedItems as $item) { + // If item is in the root of the shared storage provider and the item exists add it to the fakedirs + if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) { + $files[] = basename($item['target']); } - $FAKEDIRS['shared'] = $files; - return opendir('fakedir://shared'); } + $FAKEDIRS['shared'] = $files; + return opendir('fakedir://shared'); } else { $source = $this->getSource($path); if ($source) { From 19328fd8b2a7d050c040b5db2bf6fcc423eec1dc Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 15:56:33 -0500 Subject: [PATCH 05/11] Initial commit of common filestorage --- lib/filestoragecommon.php | 76 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 lib/filestoragecommon.php diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php new file mode 100644 index 0000000000..347a92ec1f --- /dev/null +++ b/lib/filestoragecommon.php @@ -0,0 +1,76 @@ +. +*/ + +class OC_Filestorage_Common extends OC_Filestorage { + + public function __construct($parameters){} + public function mkdir($path){} + public function rmdir($path){} + public function opendir($path){} + public function is_dir($path){} + public function is_file($path){} + public function stat($path){} + public function filetype($path){} + public function filesize($path) { + $stat = $this->stat($path); + return $stat['size']; + } + public function is_readable($path){} + public function is_writeable($path){} + public function file_exists($path){} + public function readfile($path) { + echo $this->file_get_contents($path); + return $this->filesize($path); + } + public function filectime($path) { + $stat = $this->stat($path); + return $stat['ctime']; + } + public function filemtime($path) { + $stat = $this->stat($path); + return $stat['mtime']; + } + public function fileatime($path) { + $stat = $this->stat($path); + return $stat['atime']; + } + public function file_get_contents($path) { + $handle = $this->fopen($path, "r"); + return fread($handle, $this->filesize($path)); + } + public function file_put_contents($path,$data) { + $handle = $this->fopen($path, "w"); + return fwrite($handle, $data); + } + public function unlink($path){} + public function rename($path1,$path2){} + public function copy($path1,$path2){} + public function fopen($path,$mode){} + public function toTmpFile($path){} + public function fromTmpFile($tmpPath,$path){} + public function fromUploadedFile($tmpPath,$path){} + public function getMimeType($path){} + public function hash($type,$path,$raw){} + public function free_space($path){} + public function search($query){} + public function getLocalFile($path){} +} From 782d201191c79b400ece4109fbb0e194e23880e6 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 16:25:43 -0500 Subject: [PATCH 06/11] Move to branch --- lib/filestoragecommon.php | 76 --------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 lib/filestoragecommon.php diff --git a/lib/filestoragecommon.php b/lib/filestoragecommon.php deleted file mode 100644 index 347a92ec1f..0000000000 --- a/lib/filestoragecommon.php +++ /dev/null @@ -1,76 +0,0 @@ -. -*/ - -class OC_Filestorage_Common extends OC_Filestorage { - - public function __construct($parameters){} - public function mkdir($path){} - public function rmdir($path){} - public function opendir($path){} - public function is_dir($path){} - public function is_file($path){} - public function stat($path){} - public function filetype($path){} - public function filesize($path) { - $stat = $this->stat($path); - return $stat['size']; - } - public function is_readable($path){} - public function is_writeable($path){} - public function file_exists($path){} - public function readfile($path) { - echo $this->file_get_contents($path); - return $this->filesize($path); - } - public function filectime($path) { - $stat = $this->stat($path); - return $stat['ctime']; - } - public function filemtime($path) { - $stat = $this->stat($path); - return $stat['mtime']; - } - public function fileatime($path) { - $stat = $this->stat($path); - return $stat['atime']; - } - public function file_get_contents($path) { - $handle = $this->fopen($path, "r"); - return fread($handle, $this->filesize($path)); - } - public function file_put_contents($path,$data) { - $handle = $this->fopen($path, "w"); - return fwrite($handle, $data); - } - public function unlink($path){} - public function rename($path1,$path2){} - public function copy($path1,$path2){} - public function fopen($path,$mode){} - public function toTmpFile($path){} - public function fromTmpFile($tmpPath,$path){} - public function fromUploadedFile($tmpPath,$path){} - public function getMimeType($path){} - public function hash($type,$path,$raw){} - public function free_space($path){} - public function search($query){} - public function getLocalFile($path){} -} From 536bc3d3c52bb44d9768a20041ae9f284d4f6eae Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 1 Jan 2012 23:41:30 +0100 Subject: [PATCH 07/11] add jplayer source --- .../js/jQuery.jPlayer.2.1.0.source/Jplayer.as | 415 +++ .../jQuery.jPlayer.2.1.0.source/Jplayer.fla | Bin 0 -> 61952 bytes .../add-on/jplayer.playlist.js | 452 ++++ .../add-on/jquery.jplayer.inspector.js | 331 +++ .../happyworm/jPlayer/JplayerEvent.as | 69 + .../happyworm/jPlayer/JplayerMp3.as | 328 +++ .../happyworm/jPlayer/JplayerMp4.as | 413 +++ .../happyworm/jPlayer/JplayerStatus.as | 101 + .../jquery.jplayer.js | 2349 +++++++++++++++++ 9 files changed, 4458 insertions(+) create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as create mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as new file mode 100644 index 0000000000..1178dacc34 --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as @@ -0,0 +1,415 @@ +/* + * jPlayer Plugin for jQuery JavaScript Library + * http://www.happyworm.com/jquery/jplayer + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Version: 2.1.0 + * Date: 1st September 2011 + * + * FlashVars expected: (AS3 property of: loaderInfo.parameters) + * id: (URL Encoded: String) Id of jPlayer instance + * vol: (Number) Sets the initial volume + * muted: (Boolean in a String) Sets the initial muted state + * jQuery: (URL Encoded: String) Sets the jQuery var name. Used with: someVar = jQuery.noConflict(true); + * + * Compiled using: Adobe Flex Compiler (mxmlc) Version 4.5.1 build 21328 + */ + +package { + import flash.system.Security; + import flash.external.ExternalInterface; + + import flash.utils.Timer; + import flash.events.TimerEvent; + + import flash.text.TextField; + import flash.text.TextFormat; + + import flash.events.KeyboardEvent; + + import flash.display.Sprite; + import happyworm.jPlayer.*; + + import flash.display.StageAlign; + import flash.display.StageScaleMode; + import flash.events.Event; + import flash.events.MouseEvent; + + import flash.ui.ContextMenu; + import flash.ui.ContextMenuItem; + import flash.events.ContextMenuEvent; + import flash.net.URLRequest; + import flash.net.navigateToURL; + + public class Jplayer extends Sprite { + private var jQuery:String; + private var sentNumberFractionDigits:uint = 2; + + public var commonStatus:JplayerStatus = new JplayerStatus(); // Used for inital ready event so volume is correct. + + private var myInitTimer:Timer = new Timer(100, 0); + + private var myMp3Player:JplayerMp3; + private var myMp4Player:JplayerMp4; + + private var isMp3:Boolean = false; + private var isVideo:Boolean = false; + + private var txLog:TextField; + private var debug:Boolean = false; // Set debug to false for release compile! + + public function Jplayer() { + flash.system.Security.allowDomain("*"); + + jQuery = loaderInfo.parameters.jQuery + "('#" + loaderInfo.parameters.id + "').jPlayer"; + commonStatus.volume = Number(loaderInfo.parameters.vol); + commonStatus.muted = loaderInfo.parameters.muted == "true"; + + stage.scaleMode = StageScaleMode.NO_SCALE; + stage.align = StageAlign.TOP_LEFT; + stage.addEventListener(Event.RESIZE, resizeHandler); + stage.addEventListener(MouseEvent.CLICK, clickHandler); + + var initialVolume:Number = commonStatus.volume; + if(commonStatus.muted) { + initialVolume = 0; + } + myMp3Player = new JplayerMp3(initialVolume); + addChild(myMp3Player); + + myMp4Player = new JplayerMp4(initialVolume); + addChild(myMp4Player); + + setupListeners(!isMp3, isMp3); // Set up the listeners to the default isMp3 state. + + // The ContextMenu only partially works. The menu select events never occur. + // Investigated and it is something to do with the way jPlayer inserts the Flash on the page. + // A simple test inserting the Jplayer.swf on a page using: 1) SWFObject 2.2 works. 2) AC_FL_RunContent() works. + // jPlayer Flash insertion is based on SWFObject 2.2 and the resaon behind this failure is not clear. The Flash insertion HTML on the page looks similar. + var myContextMenu:ContextMenu = new ContextMenu(); + myContextMenu.hideBuiltInItems(); + var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION); + var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2011 Happyworm Ltd", true); + menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer); + menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm); + myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm); + contextMenu = myContextMenu; + + // Log console for dev compile option: debug + if(debug) { + txLog = new TextField(); + txLog.x = 5; + txLog.y = 5; + txLog.width = 540; + txLog.height = 390; + txLog.border = true; + txLog.background = true; + txLog.backgroundColor = 0xEEEEFF; + txLog.multiline = true; + txLog.text = "jPlayer " + JplayerStatus.VERSION; + txLog.visible = false; + this.addChild(txLog); + this.stage.addEventListener(KeyboardEvent.KEY_UP, keyboardHandler); + + myMp3Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler); + myMp4Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler); + } + + // Delay init() because Firefox 3.5.7+ developed a bug with local testing in Firebug. + myInitTimer.addEventListener(TimerEvent.TIMER, init); + myInitTimer.start(); + } + + private function init(e:TimerEvent):void { + myInitTimer.stop(); + if(ExternalInterface.available) { + ExternalInterface.addCallback("fl_setAudio_mp3", fl_setAudio_mp3); + ExternalInterface.addCallback("fl_setAudio_m4a", fl_setAudio_m4a); + ExternalInterface.addCallback("fl_setVideo_m4v", fl_setVideo_m4v); + ExternalInterface.addCallback("fl_clearMedia", fl_clearMedia); + ExternalInterface.addCallback("fl_load", fl_load); + ExternalInterface.addCallback("fl_play", fl_play); + ExternalInterface.addCallback("fl_pause", fl_pause); + ExternalInterface.addCallback("fl_play_head", fl_play_head); + ExternalInterface.addCallback("fl_volume", fl_volume); + ExternalInterface.addCallback("fl_mute", fl_mute); + + ExternalInterface.call(jQuery, "jPlayerFlashEvent", JplayerEvent.JPLAYER_READY, extractStatusData(commonStatus)); // See JplayerStatus() class for version number. + } + } + private function setupListeners(oldMP3:Boolean, newMP3:Boolean):void { + if(oldMP3 != newMP3) { + if(newMP3) { + listenToMp3(true); + listenToMp4(false); + } else { + listenToMp3(false); + listenToMp4(true); + } + } + } + private function listenToMp3(active:Boolean):void { + if(active) { + myMp3Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent); + myMp3Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent); + myMp3Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent); + myMp3Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent); + + myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent); + myMp3Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent); + myMp3Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent); + + myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent); + myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent); + } else { + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent); + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent); + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent); + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent); + + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent); + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent); + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent); + + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent); + myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent); + } + } + private function listenToMp4(active:Boolean):void { + if(active) { + myMp4Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent); + myMp4Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent); + myMp4Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent); + myMp4Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent); + + myMp4Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent); + myMp4Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent); + myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent); + + myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent); + myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent); + + myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler + } else { + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent); + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent); + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent); + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent); + + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent); + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent); + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent); + + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent); + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent); + + myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler + } + } + private function fl_setAudio_mp3(src:String):Boolean { + if (src != null) { + log("fl_setAudio_mp3: "+src); + setupListeners(isMp3, true); + isMp3 = true; + isVideo = false; + myMp4Player.clearFile(); + myMp3Player.setFile(src); + return true; + } else { + log("fl_setAudio_mp3: null"); + return false; + } + } + private function fl_setAudio_m4a(src:String):Boolean { + if (src != null) { + log("fl_setAudio_m4a: "+src); + setupListeners(isMp3, false); + isMp3 = false; + isVideo = false; + myMp3Player.clearFile(); + myMp4Player.setFile(src); + return true; + } else { + log("fl_setAudio_m4a: null"); + return false; + } + } + private function fl_setVideo_m4v(src:String):Boolean { + if (src != null) { + log("fl_setVideo_m4v: "+src); + setupListeners(isMp3, false); + isMp3 = false; + isVideo = true; + myMp3Player.clearFile(); + myMp4Player.setFile(src); + return true; + } else { + log("fl_setVideo_m4v: null"); + return false; + } + } + private function fl_clearMedia():void { + log("clearMedia."); + myMp3Player.clearFile(); + myMp4Player.clearFile(); + } + private function fl_load():Boolean { + log("load."); + if(isMp3) { + return myMp3Player.load(); + } else { + return myMp4Player.load(); + } + } + private function fl_play(time:Number = NaN):Boolean { + log("play: time = " + time); + if(isMp3) { + return myMp3Player.play(time * 1000); // Flash uses milliseconds + } else { + return myMp4Player.play(time * 1000); // Flash uses milliseconds + } + } + private function fl_pause(time:Number = NaN):Boolean { + log("pause: time = " + time); + if(isMp3) { + return myMp3Player.pause(time * 1000); // Flash uses milliseconds + } else { + return myMp4Player.pause(time * 1000); // Flash uses milliseconds + } + } + private function fl_play_head(percent:Number):Boolean { + log("play_head: "+percent+"%"); + if(isMp3) { + return myMp3Player.playHead(percent); + } else { + return myMp4Player.playHead(percent); + } + } + private function fl_volume(v:Number):void { + log("volume: "+v); + commonStatus.volume = v; + if(!commonStatus.muted) { + myMp3Player.setVolume(v); + myMp4Player.setVolume(v); + } + } + private function fl_mute(mute:Boolean):void { + log("mute: "+mute); + commonStatus.muted = mute; + if(mute) { + myMp3Player.setVolume(0); + myMp4Player.setVolume(0); + } else { + myMp3Player.setVolume(commonStatus.volume); + myMp4Player.setVolume(commonStatus.volume); + } + } + private function jPlayerFlashEvent(e:JplayerEvent):void { + log("jPlayer Flash Event: " + e.type + ": " + e.target); + if(ExternalInterface.available) { + ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data)); + } + } + private function extractStatusData(data:JplayerStatus):Object { + var myStatus:Object = { + version: JplayerStatus.VERSION, + src: data.src, + paused: !data.isPlaying, // Changing this name requires inverting all assignments and conditional statements. + srcSet: data.srcSet, + seekPercent: data.seekPercent, + currentPercentRelative: data.currentPercentRelative, + currentPercentAbsolute: data.currentPercentAbsolute, + currentTime: data.currentTime / 1000, // JavaScript uses seconds + duration: data.duration / 1000, // JavaScript uses seconds + volume: commonStatus.volume, + muted: commonStatus.muted + }; + log("extractStatusData: sp="+myStatus.seekPercent+" cpr="+myStatus.currentPercentRelative+" cpa="+myStatus.currentPercentAbsolute+" ct="+myStatus.currentTime+" d="+myStatus.duration); + return myStatus; + } + private function jPlayerMetaDataHandler(e:JplayerEvent):void { + log("jPlayerMetaDataHandler:" + e.target); + if(ExternalInterface.available) { + resizeHandler(new Event(Event.RESIZE)); + ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data)); + } + } + private function resizeHandler(e:Event):void { + log("resizeHandler: stageWidth = " + stage.stageWidth + " | stageHeight = " + stage.stageHeight); + + var mediaX:Number = 0; + var mediaY:Number = 0; + var mediaWidth:Number = 0; + var mediaHeight:Number = 0; + + if(stage.stageWidth > 0 && stage.stageHeight > 0 && myMp4Player.myVideo.width > 0 && myMp4Player.myVideo.height > 0) { + var aspectRatioStage:Number = stage.stageWidth / stage.stageHeight; + var aspectRatioVideo:Number = myMp4Player.myVideo.width / myMp4Player.myVideo.height; + if(aspectRatioStage < aspectRatioVideo) { + mediaWidth = stage.stageWidth; + mediaHeight = stage.stageWidth / aspectRatioVideo; + mediaX = 0; + mediaY = (stage.stageHeight - mediaHeight) / 2; + } else { + mediaWidth = stage.stageHeight * aspectRatioVideo; + mediaHeight = stage.stageHeight; + mediaX = (stage.stageWidth - mediaWidth) / 2; + mediaY = 0; + } + resizeEntity(myMp4Player, mediaX, mediaY, mediaWidth, mediaHeight); + } + if(debug && stage.stageWidth > 20 && stage.stageHeight > 20) { + txLog.width = stage.stageWidth - 10; + txLog.height = stage.stageHeight - 10; + } + } + private function resizeEntity(entity:Sprite, mediaX:Number, mediaY:Number, mediaWidth:Number, mediaHeight:Number):void { + entity.x = mediaX; + entity.y = mediaY; + entity.width = mediaWidth; + entity.height = mediaHeight; + } + private function clickHandler(e:MouseEvent):void { + if(isMp3) { + jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp3Player.myStatus, "click")) + } else { + jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp4Player.myStatus, "click")) + } + } + // This event is never called. See comments in class constructor. + private function menuSelectHandler_jPlayer(e:ContextMenuEvent):void { + navigateToURL(new URLRequest("http://jplayer.org/"), "_blank"); + } + // This event is never called. See comments in class constructor. + private function menuSelectHandler_happyworm(e:ContextMenuEvent):void { + navigateToURL(new URLRequest("http://happyworm.com/"), "_blank"); + } + private function log(t:String):void { + if(debug) { + txLog.text = t + "\n" + txLog.text; + } + } + private function debugMsgHandler(e:JplayerEvent):void { + log(e.msg); + } + private function keyboardHandler(e:KeyboardEvent):void { + log("keyboardHandler: e.keyCode = " + e.keyCode); + switch(e.keyCode) { + case 68 : // d + txLog.visible = !txLog.visible; + log("Toggled log display: " + txLog.visible); + break; + case 76 : // l + if(e.ctrlKey && e.shiftKey) { + txLog.text = "Cleared log."; + } + break; + } + } + } +} diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla new file mode 100644 index 0000000000000000000000000000000000000000..61ae40d3ac2811ebcfd63b1ff3bb590f67984445 GIT binary patch literal 61952 zcmeHQU2Gl4b-omB%T6r+#c}-aYuRyRJEHg_$`Y%{qDje=Em^cETdpfNqR4wmS|TZv zm!cR1sE{B)A5tJdjH35VeQ019FyIyj64XFp^hrQ(&@^a@Joq6+fTBQw#3)dp1sb#8 zch1i2?(FZSX^~3jl5_8#-PtoU=bSm`%KJFa(@!$OY>xcG#_goawnV)~>+aLbVKXg2clLv3qD?=!q<<{hTF`B*9@m-ZI z9VGV_aFapbXRs)_Eh@u%fB+8hbvob`^%P3yq!V&%al=+ zhvk}2QC{~t`|j_|&Hs;n+3tfN#vl@phwwX$bO`A%((_0oNJo%fKzb4BDAF;cmynJl zjUv5_bOLD%=_JxCNUtKDLV6A950PF+`Xi*%NN*thG151Y&LE8=okf~JnnbE0)sd!< zrjcfl-bA9fo=2KRnnRjLx`6Z+(gG5DP6KHP=_1lH65Cbuxt9I^{U7)I?R)6|BKm>+ zZ$$sU8MN8x{{LS$pc3o!iSoEzl;&Qe2lz{yzZHqcx8U~+NMA&{6=@sNZAiBx!3C(? ziF6mzmyqs8`ZCfzNMAv^7wJBv`;i_%dJyR$q=%6nL8>A>inJZ+F{H(-#{wUFAQCN z-+wzm58BR7B#I=vrQtvONjv=abiMwh1t!J=*-0E_*9L~TnCs=_~`gbZ6SK% z@WS|PkVEe{S-aE-^!R1S3es)2$S44Sd^##Wg>v`=$B+MJb@dr45`2CFrO_eU0Y2NO zaM>0+Zojt!M>h__md(H>p6B^nLuhB^Ias{&u#m^Z%2o~n4Q_<=;-7j#KY|U1{M|y) zmJgvfVXe;t^9n5NLZvFu60GbDtZ5Y%cV5oE346XIIaYA?1?0boGzRO;dR-7d`6!Og z0v<5KxGd-o#RunlKfkMtI@6LEa@WpG{1uWA@ z`DIO^u1ly9xike_69Em+qXu7kU7%HzW48Qjr8 zzB%0Ys+6{fatZUkF`OZH(#shJ4vvwEat8e=BKM|8@YH2ZQ12ZCgHL!IbmiduL%2Xo zj8BjS+U;2+^d{!y$$z0q4nEP6%sKw@d{~A>rdclI2WcBJJ($)p*dcn5s&K}$x&V+< z?;gh=k+Li#{_t~I)7CBa49^zjC@xb*o$Zw=1#hyi=MA0G>qTn-l{Gv+u{2woYtTg8 zcU#_=8I0UYeX0G8V{7>sA)sp!Es@95ubnvhAHhkwogy*3fk~Vb3-BsF1_Rlyxqf=$ zua22qbY~(u%U!L|}9NS^3(X5o3 zg^?DQB_0OdNUI2yZgnk$$%~Sz@seJKozE)aD9Tq~=s0Ld{?HNu2U8n(22np+@NvwD zB=9(N%&QOWW&?bgh6SC6*F||5#`mnyv4`Jxxg32(DE$(0HsEuS&*vn!Q2hZn_b~FE zg`7^|Po~(?>y1dU&|AL#Y2y z{QfdhOdptu~UP!l>B z=S5DmuS>h0h+{0TamIj^x{w?>0{u9Qy4aSsjWxt|LV7|C^0EX9P+lz7FDGSs9#XX= zT<0wM5NbouRNA*St|@@!EAIV=Dwl8<`v7H!V~FS|33qHe9AKP|U7>q~tBz(Xk}2AT zdGyqiC~FFOojP+4{e3Zz5#h(z;`}JWslA$9rA}8Ws@BwYS=v3=9^O|_GmckOQlz!J z+r>cto)Qx8i`1AQ&3R{`Wk5m_8WSF@h^_=btN^bF==m?gx{pBj_PsGmL6yc{NCf< z%YM&M-U4#7Z*Y`mYz*=%r4oHB*H2(MP9HC$5yRFSo<}VE7vuf43pHJa4o68&pD0rj zZCu@vyhvH8(oqI4sW^|>jnKEE<(^mOGALQKVft8%Dc8F0BYHck_EkoR&pc*dKKaFd^8e0qGUZS-WMq zx#I`I#BXB<|n`Chgd4@j7v%xesWZ%b9EdM zus5@W(3eeUF~>^gd6nwT=*Uw>JKCF^UXjmBwOgzc$2($c@9c$!*ol6}eo}?jR;|W) zMl(7BMVxx(my&AD9hobyTghkkxk*Ti<;^2;-sEGWeo?Q5_LjW1cpR^uR*YVMmRCNE zD@SO^h7TQLDZxwyg#ZM8=ahahAgTfiI4gFS1jawkI(UN!vJqT5!ImhE-q3VBt_+ zhgd47)G`tmjuMF_O>XmLs$DtA$JV|a6j8PW#s^*NS7DC zXHYMKe+x2(3cPcrzN6cV?0#tDtrV=m4^ED>skP@y=^~CfMRz(Qi!#!uqoe|B*B#gF zj$TemU!sT4@e93a^(P}E2WR|T)E`EG z%dB-l*`2#ZE90omewE?1ICGq3WYPF^W$Zfh$}@~7+n4!JlNU(2aqbr8u`SiIX$N9`-`fU}Z5gG@kL3k+h&=EBp>s$z*$#5Oi z7-ld|F$`zs(6-=-sapDVvD4(&ge}9!J6e>O;nyWixUz;TJDRby<$_%p_vt+v~ylpW>ct_ z9W3QXYT>FH(Y3d^8kBT4&nc|DJRP@`Mg9Lc`u&{DjIn>}vuGZr^isCP=_^Ip>5Z4d z>pagZ!ds|OSXakCEYow6^WT=P&geK_!i+5Cu6}UpS0oo)Pr`mQ58iODXBM&>nQcvs z+PG+wGeXOOjMJZ_XUUnJs9muwywjC0wdH)`t7~_)G?B&a>3R7kqr0l%DC!)p*>=|K zbjX^o#N0En$HszqzAPh%yWMhiyuseak!T8C68@03hjSNP$xTU$KA$Evo}u(OS~H4U zM-rTAkFT!dY?Y;^qqp-lW~SbCYLSnnoR6L_xg~Y?nxE+Q zKa>phfcIjCdQ7;^dG=a#wo2{fL#}K^C8Z>e#L74JI^zvS*HI)SyrYk@lXxN>wjxJX z9a$^Vo~#G`*vP11UFHl>*0q z&hK&Y*}jPXM_#stDcvWrZFcNqejiT9MO&<^MS-=Gy>KsU>CBPlV;+RBz;&UtJh2s< zZQ8Q%DY}j?^&Jk>hBb10j3T=jK5rmr7Xpt+Yshy{KFi8LT{EXooz-S?Wh^~VU0JEN zFz#^`)tB>w#%l}5foON?d}on9%+UFX6;)APmSHIq>%Q2N`Q);2eV@bqBK;HBeVkFL zql|$2j-OS=?oL4_>(*n9^uolLPjjLqr$3b`h1R`5w>fmk(@fMHOBjK$7Yzb4`9ps# z;z2lLt~_kUALcCYdHm5cF+Ql7O&9;k8H?m=w}LTOLSEEgR6AwnFbuS)Eqi1L^?C`s zI)afQ-$>B+#KthU@lDX-6=>=anD%gBZqwVP2>LAc(~2*;;_r*^-^t1!G5t1cDn7O-i+5dm8U zJR=|shGxD*5HF%jH3C$9f_aC*+$Wg#0~E}Cf_Vs_VD1ylhXD%aKEXT!P%zgmX1TX6 znC~{I>VlaC=~cnp4^S}I1vASP%yq$h5TIaoNY~eglI5e#cL~d@S8%V=N-|%vV4YVd z0qVU?f^Pr}NJsE>fC1?Uz6LNL9l@&r1+!C)KEXT+E-9@9^C<3ATD5rZXype1s#OJl zixXfM;4Gd7#1@jJrxh|OZ8_adVJY+D}1v7ahm>ts9>maRsw1F<^c$K76 z;`9;xz6Ir8Qc|xrdG#E?fOG^&*no5d&j1WaNALr4Z=YbkVp`M}V78=FRF-rE-!KjA zTO~*yNdxN@f@F%+sxFwX8q7|6>r&@YWR+UgTfCP%QdEMOz3d(7IC0`Mn@wcqM>69# z04tiAS4ldhMjyc+TCh&=dlnQ_q+~!kUY!FNkdELqz<_iF-!qx}1oIVKlgxdB`TG_O zFq^9_-g_=29YOLaARWOE4d%LF{=lHB3+5}9Rsm*9Iz?qkN09v}jdZP63s?F1D21?< z3a^rM+WbC(e{R7#K?Z4&&B1qCxHsaIEd^#Z_vbOhfuSNjC>6-y1l{6h;0=I>cB zz-&7#QISUh=?GGurQEt;e$U)n7tG|5W){rkk%9qc14^CQkJ3m-!=j}7B$af$O43Pt zp+x}xg$3&be_+8T!9TTNi{NDoN68 zSwPqU-1|PRN1;twJu%KA0UVy@Vh(0R07ofDLWiiXumSFyZ$=njmG>dvwFh6WT!OVj6 zs$lL0D40{|-q@Z9Xj}#QlB%Oe0d5m---W1?8!ZyWP z{Q_45($N5YY>5+C=Rn6c#ait!8n`LeigsVhZHl#`Z}tvZ))LHgAp+77^RJOrs?iEC z2luuFGkGMaT7sE8Qcy6{HxtaOg85ef1JV&Qc_f)v1I#9~U}itkdj&K5k%EGmq!Z8~ z9lAO&XUSxZU?x+3Nv5m{=AQu!NJoQ99tBcIko_ni z9YG4epjr(u8&rasq!Y{zaUgWKmram@oU2fxxcU=w6^a2M?Y`1VtQCDTrIlDK_I;@a znv2Xdiwat6rR^2WAK|K$3mt>ZZJ6QX&S@#&Dg)bu$1O}-f3xWBxD8ICq)@AQcR_jhtv3~|$z zJ1RpjpB!A8oS7f1H5xN>Q`{gDWxR%}cGz0TglC6r3ZfOdDrY#=Qs$$GD6zboRN$R* z9KnEdtIK!ouRMz$q)WceVX}u0OSuq<)1h-R$+r6GcAVo&N}O^#g+&#|V49ENo+0F$ z#+4B)GviW;G5o%SX}Ssgp2PP(+_N3{4`8c8+V24*K2YTpKc_US0-r}Y+=Aqi;OBx6 zT?#c2oHx050T=HuSQ;pUH3}C`Rf9#|ID&c+?5 zVs?%A$VVS19RPQ9Ppq9HJv&8uPU5&933aNvXql zZe4mnIWCl7$*fTyBs{Aw*?5cU!$pF8;IgugbxFe+uLn75`dzx5U+aD`33*TUiVNsp z3y{EY!#w8O1upWj4D}p)G&kjA@94pAcJJVw1E4hfgg$gV04d-GH||2yU0BRca}@87 zx&)e(OT)C;>8rZo7_3l|%H?&>tZ1aNx{i;jxa2}LWL$%nFLM$7a0Ohdf%05Xvj`5F zZ5qP`9n|G<9%N}?){1!QpNSHAwNmV9)+MeN$&CR#oFgr$mH6@%x8NCuu2z0^K{wEk z7=X=v2KxIj=(!L2dN2NZ<%l+uTWjtGv>WG!p{Jh1Q4hWcp|^%`Uq8-U?8y%@UGZ{_ASGHL7q zwPEPx=%QXeS~tCr`oryqSz0$*CsR(S6$ZeQa6#7r950|8^$sS5irIP7s8v)NrJ%T{ ztq1p`^-eE!E%jf97fg#+qzzMzNhdMnXdg}ByI6Y5}YR~s&e)y2LI)Ga!?XxGb( z)-bP(qB=+Y8_Kim&7?`n#>@XAWd9;Kym7L>9#$sG!)qh^Wjyt0t$x2{KTXf_N`u2KQv;AU2)W;h@ zS=Z90Swvv{33$58CUt(P4%bxtp}Y@O-zY>X#I&0*S5t`=!+a%G#N?xdu;b}HI) zipJ^DygHXgY+A0F0W>p%ZaGPNc>SD7qxSVv`)EylOQO`+9LJs~n}ZM0T6msBsj)eZ zJx?|VAELGJJc&|ca~yk~Yz{s|YvFkkrN-ts_B`1fe2CV<^CU`*&2hX|o^WO$xsHiX z7j)IqGM@5q9a3}!6_-WXFk1|PxCcw|uy|zrVr{Z|cBMKvIe)fRJ$!zAak_eHW^QtR zd9m8l-PK(^yEJotvf96APqi^KTbr0)nrl?QQSIsL?%lJuyLT@`o#J!(#e?5Q)YU79 z$l9T2+WF=!Tp8Gj#D!cpB5?&B*S)nH|C8}weGE{t`}+C#_@6%hr;q=sakUs1*2n*Z z5|_`lj{o@>HxP)295O3q+X;w^HObVzZA9k0jOHT6B7|}UV}8uhc1sbOZoV(;n50+j zdWrw}n;9Sf)5rge?&*~ozmdD1`1qekK?NWGb5tHD>(1BCZc>@@le?GTb|3#UjP%Q$ zvwi$e?yy|6AD7u5D7q&gcO}!kHZhr?y8(yKK>{A@}hY~@`?B^U}g5`(wAYV5mI*PO6(Np*>p0`J(zF6Vof2Qrj`8*a1*MpatlUzO`d?oMMqxiy|^{kw@g+;r?`uLw2v5(t~ zbQ0gemVJaCZ}?)EkN?@gCJ|127iVARGMe9vV%yU~WiZ>FfK^vI{V2abntjQw7Ib#$ z&%Zlk$7W~W<05~H%i=jg9ml+zkN@f8e-_D0xJ$Z^|H;>NvtoFJqeR=gAB&HK^7qW< z3^!+z)X#DD;HKSf3mbRfZosZg<5hM>xaIubFurHS0}v0)(Hlh`KnaYANE+^}eLOOv zkN+7T>2M@09-0%As*F|g@jt^EY|429l25;v(L4B3bP(TKZT9wfzbuk`?eRYTCpRU6 z9&$!*MRT$lUdtMGus1$knOQjI_3=OX94E_OjiFcg_@4vV>VumrsV3%FEJeC}{Lhpb zB#qg`7oC0lPi|GirvrRtTDRNE>UCyDvS3`ghPh4?Nrc{Knw~CGJ3H5^7@W~*-W*+K zbTvoM=lj5X_1wq*lt@0bv`);O@*_1L|1+!qnRrLKnV!-0+%SvtBA_{w;~$pkIm!8N z+Yg;_R{k818Ta}4pL`PL<9|-We`7qWEP2kS8$5PHm&zIbiy1N=5d$ps}eEiP~ z7}v(1AW+L7;DwL>3Ce^s0A`+@8y0E2Me&Gy{7-0-yyt~J{-=r6>EnNLEW7#rta3Be+fz6f>;D3QJhjtD4`z6hQX5Cc68c65oLkN*j3`1qfJY}lwU zc*CBded-_%!wRWf`S_oaKIr3rLN+czGDMBkB|6z800}Bpm*`|Z{%1fOAOBNhw2EvX z{Fq2i5PuA|3*h@uGAc+Coy^Do3>IZ(EkN*j3`1qeb{-^eca2v8P<|z6L-4fGnf+2XBXr&TZGI6Jm z|H(BJV|Xgz<9{Nml#l<(Xj~>*rpE0^Myy-L0;^@j=kxJD!(Av%B$VtJou4H#lg3EP z#+|kgWm=7*u{wSHPriu27ms}WPapr(K1sW>K2b?ET9A+b zxqi_~-R*%i>S&(L(P*W|@tA&NqDDnyrk1Nkacj!NLsNgi$Nw~Rh{pZ9wz1kY@^My# zxHN8uzMMJIxNQbg7`HIrbMo;&qp{F@{Lcm!+?11jAOF+zyy$Pd7v{yK{VXG_sHVy* zV=bD)jqd5=f37{6bv%}4xqh|Yu{6_5&6bRKozo+6ejZWKLtlFUtj`Do`�DN>v0;j*NSUn@AEC$So)`x?s<|%m5n{;d9tze zPb=N?B#kN?d(QJ@W9gq(y5~t6RW|mV=gG#>Kdp4nlQgPq>^aYqjirBD>1*Z5riuT# Lr)S@~#Q*$1&)N_z literal 0 HcmV?d00001 diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js new file mode 100644 index 0000000000..0eaa0ddf3d --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js @@ -0,0 +1,452 @@ +/* + * Playlist Object for the jPlayer Plugin + * http://www.jplayer.org + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Version: 2.1.0 (jPlayer 2.1.0) + * Date: 1st September 2011 + */ + +/* Code verified using http://www.jshint.com/ */ +/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */ +/*global jPlayerPlaylist: true, jQuery:false, alert:false */ + +(function($, undefined) { + + jPlayerPlaylist = function(cssSelector, playlist, options) { + var self = this; + + this.current = 0; + this.loop = false; // Flag used with the jPlayer repeat event + this.shuffled = false; + this.removing = false; // Flag is true during remove animation, disabling the remove() method until complete. + + this.cssSelector = $.extend({}, this._cssSelector, cssSelector); // Object: Containing the css selectors for jPlayer and its cssSelectorAncestor + this.options = $.extend(true, {}, this._options, options); // Object: The jPlayer constructor options for this playlist and the playlist options + + this.playlist = []; // Array of Objects: The current playlist displayed (Un-shuffled or Shuffled) + this.original = []; // Array of Objects: The original playlist + + this._initPlaylist(playlist); // Copies playlist to this.original. Then mirrors this.original to this.playlist. Creating two arrays, where the element pointers match. (Enables pointer comparison.) + + // Setup the css selectors for the extra interface items used by the playlist. + this.cssSelector.title = this.cssSelector.cssSelectorAncestor + " .jp-title"; // Note that the text is written to the decendant li node. + this.cssSelector.playlist = this.cssSelector.cssSelectorAncestor + " .jp-playlist"; + this.cssSelector.next = this.cssSelector.cssSelectorAncestor + " .jp-next"; + this.cssSelector.previous = this.cssSelector.cssSelectorAncestor + " .jp-previous"; + this.cssSelector.shuffle = this.cssSelector.cssSelectorAncestor + " .jp-shuffle"; + this.cssSelector.shuffleOff = this.cssSelector.cssSelectorAncestor + " .jp-shuffle-off"; + + // Override the cssSelectorAncestor given in options + this.options.cssSelectorAncestor = this.cssSelector.cssSelectorAncestor; + + // Override the default repeat event handler + this.options.repeat = function(event) { + self.loop = event.jPlayer.options.loop; + }; + + // Create a ready event handler to initialize the playlist + $(this.cssSelector.jPlayer).bind($.jPlayer.event.ready, function(event) { + self._init(); + }); + + // Create an ended event handler to move to the next item + $(this.cssSelector.jPlayer).bind($.jPlayer.event.ended, function(event) { + self.next(); + }); + + // Create a play event handler to pause other instances + $(this.cssSelector.jPlayer).bind($.jPlayer.event.play, function(event) { + $(this).jPlayer("pauseOthers"); + }); + + // Create a resize event handler to show the title in full screen mode. + $(this.cssSelector.jPlayer).bind($.jPlayer.event.resize, function(event) { + if(event.jPlayer.options.fullScreen) { + $(self.cssSelector.title).show(); + } else { + $(self.cssSelector.title).hide(); + } + }); + + // Create click handlers for the extra buttons that do playlist functions. + $(this.cssSelector.previous).click(function() { + self.previous(); + $(this).blur(); + return false; + }); + + $(this.cssSelector.next).click(function() { + self.next(); + $(this).blur(); + return false; + }); + + $(this.cssSelector.shuffle).click(function() { + self.shuffle(true); + return false; + }); + $(this.cssSelector.shuffleOff).click(function() { + self.shuffle(false); + return false; + }).hide(); + + // Put the title in its initial display state + if(!this.options.fullScreen) { + $(this.cssSelector.title).hide(); + } + + // Remove the empty
  • from the page HTML. Allows page to be valid HTML, while not interfereing with display animations + $(this.cssSelector.playlist + " ul").empty(); + + // Create .live() handlers for the playlist items along with the free media and remove controls. + this._createItemHandlers(); + + // Instance jPlayer + $(this.cssSelector.jPlayer).jPlayer(this.options); + }; + + jPlayerPlaylist.prototype = { + _cssSelector: { // static object, instanced in constructor + jPlayer: "#jquery_jplayer_1", + cssSelectorAncestor: "#jp_container_1" + }, + _options: { // static object, instanced in constructor + playlistOptions: { + autoPlay: false, + loopOnPrevious: false, + shuffleOnLoop: true, + enableRemoveControls: false, + displayTime: 'slow', + addTime: 'fast', + removeTime: 'fast', + shuffleTime: 'slow', + itemClass: "jp-playlist-item", + freeGroupClass: "jp-free-media", + freeItemClass: "jp-playlist-item-free", + removeItemClass: "jp-playlist-item-remove" + } + }, + option: function(option, value) { // For changing playlist options only + if(value === undefined) { + return this.options.playlistOptions[option]; + } + + this.options.playlistOptions[option] = value; + + switch(option) { + case "enableRemoveControls": + this._updateControls(); + break; + case "itemClass": + case "freeGroupClass": + case "freeItemClass": + case "removeItemClass": + this._refresh(true); // Instant + this._createItemHandlers(); + break; + } + return this; + }, + _init: function() { + var self = this; + this._refresh(function() { + if(self.options.playlistOptions.autoPlay) { + self.play(self.current); + } else { + self.select(self.current); + } + }); + }, + _initPlaylist: function(playlist) { + this.current = 0; + this.shuffled = false; + this.removing = false; + this.original = $.extend(true, [], playlist); // Copy the Array of Objects + this._originalPlaylist(); + }, + _originalPlaylist: function() { + var self = this; + this.playlist = []; + // Make both arrays point to the same object elements. Gives us 2 different arrays, each pointing to the same actual object. ie., Not copies of the object. + $.each(this.original, function(i,v) { + self.playlist[i] = self.original[i]; + }); + }, + _refresh: function(instant) { + /* instant: Can be undefined, true or a function. + * undefined -> use animation timings + * true -> no animation + * function -> use animation timings and excute function at half way point. + */ + var self = this; + + if(instant && !$.isFunction(instant)) { + $(this.cssSelector.playlist + " ul").empty(); + $.each(this.playlist, function(i,v) { + $(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i])); + }); + this._updateControls(); + } else { + var displayTime = $(this.cssSelector.playlist + " ul").children().length ? this.options.playlistOptions.displayTime : 0; + + $(this.cssSelector.playlist + " ul").slideUp(displayTime, function() { + var $this = $(this); + $(this).empty(); + + $.each(self.playlist, function(i,v) { + $this.append(self._createListItem(self.playlist[i])); + }); + self._updateControls(); + if($.isFunction(instant)) { + instant(); + } + if(self.playlist.length) { + $(this).slideDown(self.options.playlistOptions.displayTime); + } else { + $(this).show(); + } + }); + } + }, + _createListItem: function(media) { + var self = this; + + // Wrap the
  • contents in a
    + var listItem = "
  • "; + + // Create remove control + listItem += "×"; + + // Create links to free media + if(media.free) { + var first = true; + listItem += "("; + $.each(media, function(property,value) { + if($.jPlayer.prototype.format[property]) { // Check property is a media format. + if(first) { + first = false; + } else { + listItem += " | "; + } + listItem += "" + property + ""; + } + }); + listItem += ")"; + } + + // The title is given next in the HTML otherwise the float:right on the free media corrupts in IE6/7 + listItem += "" + media.title + (media.artist ? " " : "") + ""; + listItem += "
    • "; + + return listItem; + }, + _createItemHandlers: function() { + var self = this; + // Create .live() handlers for the playlist items + $(this.cssSelector.playlist + " a." + this.options.playlistOptions.itemClass).die("click").live("click", function() { + var index = $(this).parent().parent().index(); + if(self.current !== index) { + self.play(index); + } else { + $(self.cssSelector.jPlayer).jPlayer("play"); + } + $(this).blur(); + return false; + }); + + // Create .live() handlers that disable free media links to force access via right click + $(self.cssSelector.playlist + " a." + this.options.playlistOptions.freeItemClass).die("click").live("click", function() { + $(this).parent().parent().find("." + self.options.playlistOptions.itemClass).click(); + $(this).blur(); + return false; + }); + + // Create .live() handlers for the remove controls + $(self.cssSelector.playlist + " a." + this.options.playlistOptions.removeItemClass).die("click").live("click", function() { + var index = $(this).parent().parent().index(); + self.remove(index); + $(this).blur(); + return false; + }); + }, + _updateControls: function() { + if(this.options.playlistOptions.enableRemoveControls) { + $(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).show(); + } else { + $(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).hide(); + } + if(this.shuffled) { + $(this.cssSelector.shuffleOff).show(); + $(this.cssSelector.shuffle).hide(); + } else { + $(this.cssSelector.shuffleOff).hide(); + $(this.cssSelector.shuffle).show(); + } + }, + _highlight: function(index) { + if(this.playlist.length && index !== undefined) { + $(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current"); + $(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current"); + $(this.cssSelector.title + " li").html(this.playlist[index].title + (this.playlist[index].artist ? " " : "")); + } + }, + setPlaylist: function(playlist) { + this._initPlaylist(playlist); + this._init(); + }, + add: function(media, playNow) { + $(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime); + this._updateControls(); + this.original.push(media); + this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system. + + if(playNow) { + this.play(this.playlist.length - 1); + } else { + if(this.original.length === 1) { + this.select(0); + } + } + }, + remove: function(index) { + var self = this; + + if(index === undefined) { + this._initPlaylist([]); + this._refresh(function() { + $(self.cssSelector.jPlayer).jPlayer("clearMedia"); + }); + return true; + } else { + + if(this.removing) { + return false; + } else { + index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array. + if(0 <= index && index < this.playlist.length) { + this.removing = true; + + $(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() { + $(this).remove(); + + if(self.shuffled) { + var item = self.playlist[index]; + $.each(self.original, function(i,v) { + if(self.original[i] === item) { + self.original.splice(i, 1); + return false; // Exit $.each + } + }); + self.playlist.splice(index, 1); + } else { + self.original.splice(index, 1); + self.playlist.splice(index, 1); + } + + if(self.original.length) { + if(index === self.current) { + self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed + self.select(self.current); + } else if(index < self.current) { + self.current--; + } + } else { + $(self.cssSelector.jPlayer).jPlayer("clearMedia"); + self.current = 0; + self.shuffled = false; + self._updateControls(); + } + + self.removing = false; + }); + } + return true; + } + } + }, + select: function(index) { + index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array. + if(0 <= index && index < this.playlist.length) { + this.current = index; + this._highlight(index); + $(this.cssSelector.jPlayer).jPlayer("setMedia", this.playlist[this.current]); + } else { + this.current = 0; + } + }, + play: function(index) { + index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array. + if(0 <= index && index < this.playlist.length) { + if(this.playlist.length) { + this.select(index); + $(this.cssSelector.jPlayer).jPlayer("play"); + } + } else if(index === undefined) { + $(this.cssSelector.jPlayer).jPlayer("play"); + } + }, + pause: function() { + $(this.cssSelector.jPlayer).jPlayer("pause"); + }, + next: function() { + var index = (this.current + 1 < this.playlist.length) ? this.current + 1 : 0; + + if(this.loop) { + // See if we need to shuffle before looping to start, and only shuffle if more than 1 item. + if(index === 0 && this.shuffled && this.options.playlistOptions.shuffleOnLoop && this.playlist.length > 1) { + this.shuffle(true, true); // playNow + } else { + this.play(index); + } + } else { + // The index will be zero if it just looped round + if(index > 0) { + this.play(index); + } + } + }, + previous: function() { + var index = (this.current - 1 >= 0) ? this.current - 1 : this.playlist.length - 1; + + if(this.loop && this.options.playlistOptions.loopOnPrevious || index < this.playlist.length - 1) { + this.play(index); + } + }, + shuffle: function(shuffled, playNow) { + var self = this; + + if(shuffled === undefined) { + shuffled = !this.shuffled; + } + + if(shuffled || shuffled !== this.shuffled) { + + $(this.cssSelector.playlist + " ul").slideUp(this.options.playlistOptions.shuffleTime, function() { + self.shuffled = shuffled; + if(shuffled) { + self.playlist.sort(function() { + return 0.5 - Math.random(); + }); + } else { + self._originalPlaylist(); + } + self._refresh(true); // Instant + + if(playNow || !$(self.cssSelector.jPlayer).data("jPlayer").status.paused) { + self.play(0); + } else { + self.select(0); + } + + $(this).slideDown(self.options.playlistOptions.shuffleTime); + }); + } + } + }; +})(jQuery); diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js new file mode 100644 index 0000000000..46c090a1b0 --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js @@ -0,0 +1,331 @@ +/* + * jPlayerInspector Plugin for jPlayer (2.0.0+) Plugin for jQuery JavaScript Library + * http://www.happyworm.com/jquery/jplayer + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Version: 1.0.3 + * Date: 7th August 2011 + * + * For use with jPlayer Version: 2.0.29 + * + * Note: Declare inspector instances after jPlayer instances. ie., Otherwise the jPlayer instance is nonsense. + */ + +(function($, undefined) { + $.jPlayerInspector = {}; + $.jPlayerInspector.i = 0; + $.jPlayerInspector.defaults = { + jPlayer: undefined, // The jQuery selector of the jPlayer instance to inspect. + idPrefix: "jplayer_inspector_", + visible: false + }; + + var methods = { + init: function(options) { + var self = this; + var $this = $(this); + + var config = $.extend({}, $.jPlayerInspector.defaults, options); + $(this).data("jPlayerInspector", config); + + config.id = $(this).attr("id"); + config.jPlayerId = config.jPlayer.attr("id"); + + config.windowId = config.idPrefix + "window_" + $.jPlayerInspector.i; + config.statusId = config.idPrefix + "status_" + $.jPlayerInspector.i; + config.configId = config.idPrefix + "config_" + $.jPlayerInspector.i; + config.toggleId = config.idPrefix + "toggle_" + $.jPlayerInspector.i; + config.eventResetId = config.idPrefix + "event_reset_" + $.jPlayerInspector.i; + config.updateId = config.idPrefix + "update_" + $.jPlayerInspector.i; + config.eventWindowId = config.idPrefix + "event_window_" + $.jPlayerInspector.i; + + config.eventId = {}; + config.eventJq = {}; + config.eventTimeout = {}; + config.eventOccurrence = {}; + + $.each($.jPlayer.event, function(eventName,eventType) { + config.eventId[eventType] = config.idPrefix + "event_" + eventName + "_" + $.jPlayerInspector.i; + config.eventOccurrence[eventType] = 0; + }); + + var structure = + '

    ' + (config.visible ? "Hide" : "Show") + ' jPlayer Inspector

    ' + + '
    ' + + '
    ' + + '
    ' + + '

    jPlayer events that have occurred over the past 1 second:' + + '
    (Backgrounds: Never occurred Occurred before Occurred Multiple occurrences reset)

    '; + + // MJP: Would use the next 3 lines for ease, but the events are just slapped on the page. + // $.each($.jPlayer.event, function(eventName,eventType) { + // structure += '
    ' + eventName + '
    '; + // }); + + var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;"; + // MJP: Doing it longhand so order and layout easier to control. + structure += + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    '; + + // MJP: Would like a check here in case we missed an event. + + // MJP: Check fails, since it is not on the page yet. +/* $.each($.jPlayer.event, function(eventName,eventType) { + if($("#" + config.eventId[eventType])[0] === undefined) { + structure += '
    ' + eventName + '
    '; + } + }); +*/ + structure += + '
    ' + + '

    Update jPlayer Inspector

    ' + + '
    ' + + '
    '; + $(this).html(structure); + + config.windowJq = $("#" + config.windowId); + config.statusJq = $("#" + config.statusId); + config.configJq = $("#" + config.configId); + config.toggleJq = $("#" + config.toggleId); + config.eventResetJq = $("#" + config.eventResetId); + config.updateJq = $("#" + config.updateId); + + $.each($.jPlayer.event, function(eventName,eventType) { + config.eventJq[eventType] = $("#" + config.eventId[eventType]); + config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0); + + config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) { + config.eventOccurrence[e.type]++; + if(config.eventOccurrence[e.type] > 1) { + config.eventJq[e.type].css("background-color","#ff9"); + } else { + config.eventJq[e.type].css("background-color","#9f9"); + } + config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")"); + // The timer to handle the color + clearTimeout(config.eventTimeout[e.type]); + config.eventTimeout[e.type] = setTimeout(function() { + config.eventJq[e.type].css("background-color","#fff"); + }, 1000); + // The timer to handle the occurences. + setTimeout(function() { + config.eventOccurrence[e.type]--; + config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")"); + }, 1000); + if(config.visible) { // Update the status, if inspector open. + $this.jPlayerInspector("updateStatus"); + } + }); + }); + + config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) { + $this.jPlayerInspector("updateConfig"); + }); + + config.toggleJq.click(function() { + if(config.visible) { + $(this).text("Show"); + config.windowJq.hide(); + config.statusJq.empty(); + config.configJq.empty(); + } else { + $(this).text("Hide"); + config.windowJq.show(); + config.updateJq.click(); + } + config.visible = !config.visible; + $(this).blur(); + return false; + }); + + config.eventResetJq.click(function() { + $.each($.jPlayer.event, function(eventName,eventType) { + config.eventJq[eventType].css("background-color","#eee"); + }); + $(this).blur(); + return false; + }); + + config.updateJq.click(function() { + $this.jPlayerInspector("updateStatus"); + $this.jPlayerInspector("updateConfig"); + return false; + }); + + if(!config.visible) { + config.windowJq.hide(); + } else { + // config.updateJq.click(); + } + + $.jPlayerInspector.i++; + + return this; + }, + destroy: function() { + $(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector"); + $(this).empty(); + }, + updateConfig: function() { // This displays information about jPlayer's configuration in inspector + + var jPlayerInfo = "

    This jPlayer instance is running in your browser where:
    " + + for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) { + var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i]; + jPlayerInfo += " jPlayer's " + solution + " solution is"; + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) { + jPlayerInfo += " being used and will support:"; + for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) { + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) { + jPlayerInfo += " " + format; + } + } + jPlayerInfo += "
    "; + } else { + jPlayerInfo += " not required
    "; + } + } + jPlayerInfo += "

    "; + + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) { + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) { + jPlayerInfo += "Problem with jPlayer since both HTML5 and Flash are active."; + } else { + jPlayerInfo += "The HTML5 is active."; + } + } else { + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) { + jPlayerInfo += "The Flash is active."; + } else { + jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia()."; + } + } + jPlayerInfo += "

    "; + + var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType; + jPlayerInfo += "

    status.formatType = '" + formatType + "'
    "; + if(formatType) { + jPlayerInfo += "Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')"; + } else { + jPlayerInfo += "

    "; + } + + jPlayerInfo += "

    status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'

    "; + + jPlayerInfo += "

    status.media = {
    "; + for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) { + jPlayerInfo += " " + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "
    "; // Some are strings + } + jPlayerInfo += "};

    " + + + "

    Raw browser test for HTML5 support. Should equal a function if HTML5 is available.
    "; + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) { + jPlayerInfo += "htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"
    " + } + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) { + jPlayerInfo += "htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +""; + } + jPlayerInfo += "

    "; + + jPlayerInfo += "

    This instance is using the constructor options:
    " + + "$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({
    " + + + " swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',
    " + + + " solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',
    " + + + " supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',
    " + + + " preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',
    " + + + " volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",
    " + + + " muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",
    " + + + " backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',
    " + + + " cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',
    " + + + " cssSelector: {"; + + var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector"); + for(prop in cssSelector) { + + // jPlayerInfo += "
      " + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys. + jPlayerInfo += "
      " + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "'," + } + + jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me. + + jPlayerInfo += "
     },
    " + + + " errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",
    " + + + " warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "
    " + + + "});

    "; + $(this).data("jPlayerInspector").configJq.html(jPlayerInfo); + return this; + }, + updateStatus: function() { // This displays information about jPlayer's status in the inspector + $(this).data("jPlayerInspector").statusJq.html( + "

    jPlayer is " + + ($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") + + " at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." + + " (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" + + ", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" + + ", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" + + ", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)

    " + ); + return this; + } + }; + $.fn.jPlayerInspector = function( method ) { + // Method calling logic + if ( methods[method] ) { + return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 )); + } else if ( typeof method === 'object' || ! method ) { + return methods.init.apply( this, arguments ); + } else { + $.error( 'Method ' + method + ' does not exist on jQuery.jPlayerInspector' ); + } + }; +})(jQuery); diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as new file mode 100644 index 0000000000..addb97a7ae --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as @@ -0,0 +1,69 @@ +/* + * jPlayer Plugin for jQuery JavaScript Library + * http://www.happyworm.com/jquery/jplayer + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Date: 8th August 2011 + */ + +package happyworm.jPlayer { + import flash.events.Event; + + public class JplayerEvent extends Event { + + // The event strings must match those in the JavaScript's $.jPlayer.event object + + public static const JPLAYER_READY:String = "jPlayer_ready"; + public static const JPLAYER_FLASHRESET:String = "jPlayer_flashreset"; // Handled in JavaScript + public static const JPLAYER_RESIZE:String = "jPlayer_resize"; // Handled in JavaScript + public static const JPLAYER_REPEAT:String = "jPlayer_repeat"; // Handled in JavaScript + public static const JPLAYER_CLICK:String = "jPlayer_click"; + public static const JPLAYER_ERROR:String = "jPlayer_error"; + public static const JPLAYER_WARNING:String = "jPlayer_warning"; // Currently not used by the flash solution + + public static const JPLAYER_LOADSTART:String = "jPlayer_loadstart"; + public static const JPLAYER_PROGRESS:String = "jPlayer_progress"; + public static const JPLAYER_SUSPEND:String = "jPlayer_suspend"; // Not implemented + public static const JPLAYER_ABORT:String = "jPlayer_abort"; // Not implemented + public static const JPLAYER_EMPTIED:String = "jPlayer_emptied"; // Not implemented + public static const JPLAYER_STALLED:String = "jPlayer_stalled"; // Not implemented + public static const JPLAYER_PLAY:String = "jPlayer_play"; + public static const JPLAYER_PAUSE:String = "jPlayer_pause"; + public static const JPLAYER_LOADEDMETADATA:String = "jPlayer_loadedmetadata"; // MP3 has no equivilent + public static const JPLAYER_LOADEDDATA:String = "jPlayer_loadeddata"; // Not implemented + public static const JPLAYER_WAITING:String = "jPlayer_waiting"; // Not implemented + public static const JPLAYER_PLAYING:String = "jPlayer_playing"; // Not implemented + public static const JPLAYER_CANPLAY:String = "jPlayer_canplay"; // Not implemented + public static const JPLAYER_CANPLAYTHROUGH:String = "jPlayer_canplaythrough"; // Not implemented + public static const JPLAYER_SEEKING:String = "jPlayer_seeking"; + public static const JPLAYER_SEEKED:String = "jPlayer_seeked"; + public static const JPLAYER_TIMEUPDATE:String = "jPlayer_timeupdate"; + public static const JPLAYER_ENDED:String = "jPlayer_ended"; + public static const JPLAYER_RATECHANGE:String = "jPlayer_ratechange"; // Not implemented + public static const JPLAYER_DURATIONCHANGE:String = "jPlayer_durationchange"; // Not implemented + public static const JPLAYER_VOLUMECHANGE:String = "jPlayer_volumechange"; // See JavaScript + + // Events used internal to jPlayer's Flash. + public static const DEBUG_MSG:String = "debug_msg"; + + public var data:JplayerStatus; + public var msg:String = "" + + public function JplayerEvent(type:String, data:JplayerStatus, msg:String = "", bubbles:Boolean = false, cancelable:Boolean = false) { + super(type, bubbles, cancelable); + this.data = data; + this.msg = msg; + } + public override function clone():Event { + return new JplayerEvent(type, data, msg, bubbles, cancelable); + } + public override function toString():String { + return formatToString("JplayerEvent", "type", "bubbles", "cancelable", "eventPhase", "data", "msg"); + } + } +} \ No newline at end of file diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as new file mode 100644 index 0000000000..8c51d5b763 --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as @@ -0,0 +1,328 @@ +/* + * jPlayer Plugin for jQuery JavaScript Library + * http://www.happyworm.com/jquery/jplayer + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Date: 1st September 2011 + */ + +package happyworm.jPlayer { + import flash.display.Sprite; + + import flash.media.Sound; + import flash.media.SoundChannel; + import flash.media.SoundLoaderContext; + import flash.media.SoundTransform; + import flash.net.URLRequest; + import flash.utils.Timer; + import flash.errors.IOError; + import flash.events.*; + + public class JplayerMp3 extends Sprite { + private var mySound:Sound = new Sound(); + private var myChannel:SoundChannel = new SoundChannel(); + private var myContext:SoundLoaderContext = new SoundLoaderContext(3000, false); + private var myTransform:SoundTransform = new SoundTransform(); + private var myRequest:URLRequest = new URLRequest(); + + private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq + private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq + private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over. + + public var myStatus:JplayerStatus = new JplayerStatus(); + + public function JplayerMp3(volume:Number) { + timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler); + progressTimer.addEventListener(TimerEvent.TIMER, progressHandler); + seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler); + setVolume(volume); + } + public function setFile(src:String):void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "setFile: " + src)); + if(myStatus.isPlaying) { + myChannel.stop(); + progressUpdates(false); + timeUpdates(false); + } + try { + mySound.close(); + } catch (err:IOError) { + // Occurs if the file is either yet to be opened or has finished downloading. + } + mySound = null; + mySound = new Sound(); + mySound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler); + mySound.addEventListener(Event.OPEN, loadOpen); + mySound.addEventListener(Event.COMPLETE, loadComplete); + myRequest = new URLRequest(src); + myStatus.reset(); + myStatus.src = src; + myStatus.srcSet = true; + timeUpdateEvent(); + } + public function clearFile():void { + setFile(""); + myStatus.srcSet = false; + } + private function errorHandler(err:IOErrorEvent):void { + // MP3 player needs to stop progress and timeupdate events as they are started before the error occurs. + // NB: The MP4 player works differently and the error occurs before they are started. + progressUpdates(false); + timeUpdates(false); + myStatus.error(); // Resets status except the src, and it sets srcError property. + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus)); + } + private function loadOpen(e:Event):void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadOpen:")); + myStatus.loading(); + if(myStatus.playOnLoad) { + myStatus.playOnLoad = false; // Capture the flag + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); // So loadstart event happens before play event occurs. + play(); + } else { + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); + pause(); + } + progressUpdates(true); + } + private function loadComplete(e:Event):void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadComplete:")); + myStatus.loaded(); + progressUpdates(false); + progressEvent(); + } + private function soundCompleteHandler(e:Event):void { + myStatus.pausePosition = 0; + myStatus.isPlaying = false; + timeUpdates(false); + timeUpdateEvent(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus)); + } + private function progressUpdates(active:Boolean):void { + // Using a timer rather than Flash's load progress event, because that event gave data at about 200Hz. The 10Hz timer is closer to HTML5 norm. + if(active) { + progressTimer.start(); + } else { + progressTimer.stop(); + } + } + private function progressHandler(e:TimerEvent):void { + progressEvent(); + } + private function progressEvent():void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:")); + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus)); + } + private function timeUpdates(active:Boolean):void { + if(active) { + timeUpdateTimer.start(); + } else { + timeUpdateTimer.stop(); + } + } + private function timeUpdateHandler(e:TimerEvent):void { + timeUpdateEvent(); + } + private function timeUpdateEvent():void { + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus)); + } + private function seeking(active:Boolean):void { + if(active) { + if(!myStatus.isSeeking) { + seekingEvent(); + seekingTimer.start(); + } + } else { + seekingTimer.stop(); + } + } + private function seekingHandler(e:TimerEvent):void { + if(myStatus.pausePosition <= getDuration()) { + seekedEvent(); + seeking(false); + if(myStatus.playOnSeek) { + myStatus.playOnSeek = false; // Capture the flag. + play(); + } + } else if(myStatus.isLoaded && (myStatus.pausePosition > getDuration())) { + // Illegal seek time + seeking(false); + seekedEvent(); + pause(0); + } + } + private function seekingEvent():void { + myStatus.isSeeking = true; + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus)); + } + private function seekedEvent():void { + myStatus.isSeeking = false; + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus)); + } + public function load():Boolean { + if(myStatus.loadRequired()) { + myStatus.startingDownload(); + mySound.load(myRequest, myContext); + return true; + } else { + return false; + } + } + public function play(time:Number = NaN):Boolean { + var wasPlaying:Boolean = myStatus.isPlaying; + + if(!isNaN(time) && myStatus.srcSet) { + if(myStatus.isPlaying) { + myChannel.stop(); + myStatus.isPlaying = false; + } + myStatus.pausePosition = time; + } + + if(myStatus.isStartingDownload) { + myStatus.playOnLoad = true; // Raise flag, captured in loadOpen() + return true; + } else if(myStatus.loadRequired()) { + myStatus.playOnLoad = true; // Raise flag, captured in loadOpen() + return load(); + } else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) { + if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end. + myStatus.pausePosition = 0; + timeUpdates(false); + timeUpdateEvent(); + if(wasPlaying) { // For when playing and then get a play(huge) + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus)); + } + } else if(myStatus.pausePosition > getDuration()) { + myStatus.playOnSeek = true; + seeking(true); + } else { + myStatus.isPlaying = true; // Set immediately before playing. Could affects events. + myChannel = mySound.play(myStatus.pausePosition); + myChannel.soundTransform = myTransform; + myChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler); + timeUpdates(true); + if(!wasPlaying) { + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus)); + } + } + return true; + } else { + return false; + } + } + public function pause(time:Number = NaN):Boolean { + myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before loadOpen() event. + myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set. + + var wasPlaying:Boolean = myStatus.isPlaying; + + // To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem. + var alreadyPausedAtTime:Boolean = false; + if(!isNaN(time) && myStatus.pausePosition == time) { + alreadyPausedAtTime = true; + } + + if(myStatus.isPlaying) { + myStatus.isPlaying = false; + myChannel.stop(); + if(myChannel.position > 0) { // Required otherwise a fast play then pause causes myChannel.position to equal zero and not the correct value. ie., When it happens leave pausePosition alone. + myStatus.pausePosition = myChannel.position; + } + } + + if(!isNaN(time) && myStatus.srcSet) { + myStatus.pausePosition = time; + } + + if(wasPlaying) { + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus)); + } + + if(myStatus.isStartingDownload) { + return true; + } else if(myStatus.loadRequired()) { + if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation. + return load(); + } else { + return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required. + } + } else if(myStatus.isLoading || myStatus.isLoaded) { + if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end. + myStatus.pausePosition = 0; + } else if(myStatus.pausePosition > getDuration()) { + seeking(true); + } + timeUpdates(false); + // Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop. + // Neither pause() nor pause(time) will cause a timeupdate loop. + if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) { + timeUpdateEvent(); + } + return true; + } else { + return false; + } + } + public function playHead(percent:Number):Boolean { + var time:Number = percent * getDuration() / 100; + if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) { + return play(time); + } else { + return pause(time); + } + } + public function setVolume(v:Number):void { + myStatus.volume = v; + myTransform.volume = v; + myChannel.soundTransform = myTransform; + } + private function updateStatusValues():void { + myStatus.seekPercent = 100 * getLoadRatio(); + myStatus.currentTime = getCurrentTime(); + myStatus.currentPercentRelative = 100 * getCurrentRatioRel(); + myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs(); + myStatus.duration = getDuration(); + } + public function getLoadRatio():Number { + if((myStatus.isLoading || myStatus.isLoaded) && mySound.bytesTotal > 0) { + return mySound.bytesLoaded / mySound.bytesTotal; + } else { + return 0; + } + } + public function getDuration():Number { + if(mySound.length > 0) { + return mySound.length; + } else { + return 0; + } + } + public function getCurrentTime():Number { + if(myStatus.isPlaying) { + return myChannel.position; + } else { + return myStatus.pausePosition; + } + } + public function getCurrentRatioRel():Number { + if((getDuration() > 0) && (getCurrentTime() <= getDuration())) { + return getCurrentTime() / getDuration(); + } else { + return 0; + } + } + public function getCurrentRatioAbs():Number { + return getCurrentRatioRel() * getLoadRatio(); + } + } +} diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as new file mode 100644 index 0000000000..dcdc0655d0 --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as @@ -0,0 +1,413 @@ +/* + * jPlayer Plugin for jQuery JavaScript Library + * http://www.happyworm.com/jquery/jplayer + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Date: 7th August 2011 + */ + +package happyworm.jPlayer { + import flash.display.Sprite; + + import flash.media.Video; + import flash.media.SoundTransform; + + import flash.net.NetConnection; + import flash.net.NetStream; + + import flash.utils.Timer; + + import flash.events.NetStatusEvent; + import flash.events.SecurityErrorEvent; + import flash.events.TimerEvent; + + public class JplayerMp4 extends Sprite { + + public var myVideo:Video = new Video(); + private var myConnection:NetConnection; + private var myStream:NetStream; + + private var myTransform:SoundTransform = new SoundTransform(); + + public var myStatus:JplayerStatus = new JplayerStatus(); + + private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq + private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq + private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over. + + public function JplayerMp4(volume:Number) { + myConnection = new NetConnection(); + myConnection.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler); + myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler); + myVideo.smoothing = true; + this.addChild(myVideo); + + timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler); + progressTimer.addEventListener(TimerEvent.TIMER, progressHandler); + seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler); + + myStatus.volume = volume; + } + private function progressUpdates(active:Boolean):void { + if(active) { + progressTimer.start(); + } else { + progressTimer.stop(); + } + } + private function progressHandler(e:TimerEvent):void { + if(myStatus.isLoading) { + if(getLoadRatio() == 1) { // Close as can get to a loadComplete event since client.onPlayStatus only works with FMS + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressHandler: loadComplete")); + myStatus.loaded(); + progressUpdates(false); + } + } + progressEvent(); + } + private function progressEvent():void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:")); + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus)); + } + private function timeUpdates(active:Boolean):void { + if(active) { + timeUpdateTimer.start(); + } else { + timeUpdateTimer.stop(); + } + } + private function timeUpdateHandler(e:TimerEvent):void { + timeUpdateEvent(); + } + private function timeUpdateEvent():void { + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus)); + } + private function seeking(active:Boolean):void { + if(active) { + if(!myStatus.isSeeking) { + seekingEvent(); + } + seekingTimer.start(); + } else { + if(myStatus.isSeeking) { + seekedEvent(); + } + seekingTimer.stop(); + } + } + private function seekingHandler(e:TimerEvent):void { + if(getSeekTimeRatio() <= getLoadRatio()) { + seeking(false); + if(myStatus.playOnSeek) { + myStatus.playOnSeek = false; // Capture the flag. + play(myStatus.pausePosition); // Must pass time or the seek time is never set. + } else { + pause(myStatus.pausePosition); // Must pass time or the stream.time is read. + } + } else if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { + // Illegal seek time + seeking(false); + pause(0); + } + } + private function seekingEvent():void { + myStatus.isSeeking = true; + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus)); + } + private function seekedEvent():void { + myStatus.isSeeking = false; + updateStatusValues(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus)); + } + private function netStatusHandler(e:NetStatusEvent):void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "netStatusHandler: '" + e.info.code + "'")); + switch(e.info.code) { + case "NetConnection.Connect.Success": + connectStream(); + break; + case "NetStream.Play.Start": + // This event code occurs once, when the media is opened. Equiv to loadOpen() in mp3 player. + myStatus.loading(); + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); + progressUpdates(true); + // See onMetaDataHandler() for other condition, since duration is vital. + break; + case "NetStream.Play.Stop": + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime()))); + + // Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough. + if(Math.abs(getDuration() - getCurrentTime()) < 150) { // Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play. + endedEvent(); + } + break; + case "NetStream.Seek.InvalidTime": + // Used for capturing invalid set times and clicks on the end of the progress bar. + endedEvent(); + break; + case "NetStream.Play.StreamNotFound": + myStatus.error(); // Resets status except the src, and it sets srcError property. + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus)); + break; + } + // "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready. + } + private function endedEvent():void { + var wasPlaying:Boolean = myStatus.isPlaying; + pause(0); + timeUpdates(false); + timeUpdateEvent(); + if(wasPlaying) { + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus)); + } + } + private function securityErrorHandler(event:SecurityErrorEvent):void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "securityErrorHandler.")); + } + private function connectStream():void { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "connectStream.")); + var customClient:Object = new Object(); + customClient.onMetaData = onMetaDataHandler; + // customClient.onPlayStatus = onPlayStatusHandler; // According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server). + myStream = null; + myStream = new NetStream(myConnection); + myStream.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler); + myStream.client = customClient; + myVideo.attachNetStream(myStream); + setVolume(myStatus.volume); + myStream.play(myStatus.src); + } + public function setFile(src:String):void { + if(myStream != null) { + myStream.close(); + } + myVideo.clear(); + progressUpdates(false); + timeUpdates(false); + + myStatus.reset(); + myStatus.src = src; + myStatus.srcSet = true; + timeUpdateEvent(); + } + public function clearFile():void { + setFile(""); + myStatus.srcSet = false; + } + public function load():Boolean { + if(myStatus.loadRequired()) { + myStatus.startingDownload(); + myConnection.connect(null); + return true; + } else { + return false; + } + } + public function play(time:Number = NaN):Boolean { + var wasPlaying:Boolean = myStatus.isPlaying; + + if(!isNaN(time) && myStatus.srcSet) { + if(myStatus.isPlaying) { + myStream.pause(); + myStatus.isPlaying = false; + } + myStatus.pausePosition = time; + } + + if(myStatus.isStartingDownload) { + myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler() + return true; + } else if(myStatus.loadRequired()) { + myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler() + return load(); + } else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) { + if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end. + myStream.pause(); // Since it is playing by default at this point. + myStatus.pausePosition = 0; + myStream.seek(0); + timeUpdates(false); + timeUpdateEvent(); + if(wasPlaying) { // For when playing and then get a play(huge) + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus)); + } + } else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount + myStatus.playOnSeek = true; + seeking(true); + myStream.pause(); // Since it is playing by default at this point. + } else { + if(!isNaN(time)) { // Avoid using seek() when it is already correct. + myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds + } + myStatus.isPlaying = true; // Set immediately before playing. Could affects events. + myStream.resume(); + timeUpdates(true); + if(!wasPlaying) { + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus)); + } + } + return true; + } else { + return false; + } + } + public function pause(time:Number = NaN):Boolean { + myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event. + myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set. + + var wasPlaying:Boolean = myStatus.isPlaying; + + // To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem. + var alreadyPausedAtTime:Boolean = false; + if(!isNaN(time) && myStatus.pausePosition == time) { + alreadyPausedAtTime = true; + } + + // Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready. + if(myStream != null && myStatus.metaDataReady) { // myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t). + myStream.pause(); + } + if(myStatus.isPlaying) { + myStatus.isPlaying = false; + myStatus.pausePosition = myStream.time * 1000; + } + + if(!isNaN(time) && myStatus.srcSet) { + myStatus.pausePosition = time; + } + + if(wasPlaying) { + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus)); + } + + if(myStatus.isStartingDownload) { + return true; + } else if(myStatus.loadRequired()) { + if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation. + return load(); + } else { + return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required. + } + } else if(myStatus.isLoading || myStatus.isLoaded) { + if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end. + myStatus.pausePosition = 0; + myStream.seek(0); + seekedEvent(); // Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event. + } else if(!isNaN(time)) { + if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount + seeking(true); + } else { + if(myStatus.metaDataReady) { // Otherwise seek(0) will stop the metadata loading. + myStream.seek(myStatus.pausePosition/1000); + } + } + } + timeUpdates(false); + // Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop. + // Neither pause() nor pause(time) will cause a timeupdate loop. + if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) { + timeUpdateEvent(); + } + return true; + } else { + return false; + } + } + public function playHead(percent:Number):Boolean { + var time:Number = percent * getDuration() * getLoadRatio() / 100; + if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) { + return play(time); + } else { + return pause(time); + } + } + public function setVolume(v:Number):void { + myStatus.volume = v; + myTransform.volume = v; + if(myStream != null) { + myStream.soundTransform = myTransform; + } + } + private function updateStatusValues():void { + myStatus.seekPercent = 100 * getLoadRatio(); + myStatus.currentTime = getCurrentTime(); + myStatus.currentPercentRelative = 100 * getCurrentRatioRel(); + myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs(); + myStatus.duration = getDuration(); + } + public function getLoadRatio():Number { + if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) { + return myStream.bytesLoaded / myStream.bytesTotal; + } else { + return 0; + } + } + public function getDuration():Number { + return myStatus.duration; // Set from meta data. + } + public function getCurrentTime():Number { + if(myStatus.isPlaying) { + return myStream.time * 1000; + } else { + return myStatus.pausePosition; + } + } + public function getCurrentRatioRel():Number { + if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) { + return getCurrentRatioAbs() / getLoadRatio(); + } else { + return 0; + } + } + public function getCurrentRatioAbs():Number { + if(getDuration() > 0) { + return getCurrentTime() / getDuration(); + } else { + return 0; + } + } + public function getSeekTimeRatio():Number { + if(getDuration() > 0) { + return myStatus.pausePosition / getDuration(); + } else { + return 1; + } + } + public function onMetaDataHandler(info:Object):void { // Used in connectStream() in myStream.client object. + // This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur. + if(!myStatus.metaDataReady) { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height)); + + myStatus.metaDataReady = true; // Set flag so that this event only effects jPlayer the 1st time. + myStatus.metaData = info; + myStatus.duration = info.duration * 1000; // Only available via Meta Data. + if(info.width != undefined) { + myVideo.width = info.width; + } + if(info.height != undefined) { + myVideo.height = info.height; + } + + if(myStatus.playOnLoad) { + myStatus.playOnLoad = false; // Capture the flag + if(myStatus.pausePosition > 0 ) { // Important for setMedia followed by play(time). + play(myStatus.pausePosition); + } else { + play(); // Not always sending pausePosition avoids the extra seek(0) for a normal play() command. + } + } else { + pause(myStatus.pausePosition); // Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0) + } + this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA, myStatus)); + } else { + this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: Already read (NO EFFECT)")); + } + } + } +} diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as new file mode 100644 index 0000000000..5cc1e1ff4b --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as @@ -0,0 +1,101 @@ +/* + * jPlayer Plugin for jQuery JavaScript Library + * http://www.happyworm.com/jquery/jplayer + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Date: 1st September 2011 + */ + +package happyworm.jPlayer { + public class JplayerStatus { + + public static const VERSION:String = "2.1.0"; // The version of the Flash jPlayer entity. + + public var volume:Number = 0.5; // Not affected by reset() + public var muted:Boolean = false; // Not affected by reset() + + public var src:String; + public var srcError:Boolean; + + public var srcSet:Boolean; + public var isPlaying:Boolean; + public var isSeeking:Boolean; + + public var playOnLoad:Boolean; + public var playOnSeek:Boolean; + + public var isStartingDownload:Boolean; + public var isLoading:Boolean; + public var isLoaded:Boolean; + + public var pausePosition:Number; + + public var seekPercent:Number; + public var currentTime:Number; + public var currentPercentRelative:Number; + public var currentPercentAbsolute:Number; + public var duration:Number; + + public var metaDataReady:Boolean; + public var metaData:Object; + + public function JplayerStatus() { + reset(); + } + public function reset():void { + src = ""; + srcError = false; + + srcSet = false; + isPlaying = false; + isSeeking = false; + + playOnLoad = false; + playOnSeek = false; + + isStartingDownload = false; + isLoading = false; + isLoaded = false; + + pausePosition = 0; + + seekPercent = 0; + currentTime = 0; + currentPercentRelative = 0; + currentPercentAbsolute = 0; + duration = 0; + + metaDataReady = false; + metaData = {}; + } + public function error():void { + var srcSaved:String = src; + reset(); + src = srcSaved; + srcError = true; + } + public function loadRequired():Boolean { + return (srcSet && !isStartingDownload && !isLoading && !isLoaded); + } + public function startingDownload():void { + isStartingDownload = true; + isLoading = false; + isLoaded = false; + } + public function loading():void { + isStartingDownload = false; + isLoading = true; + isLoaded = false; + } + public function loaded():void { + isStartingDownload = false; + isLoading = false; + isLoaded = true; + } + } +} diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js new file mode 100644 index 0000000000..9d41a12ee6 --- /dev/null +++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js @@ -0,0 +1,2349 @@ +/* + * jPlayer Plugin for jQuery JavaScript Library + * http://www.jplayer.org + * + * Copyright (c) 2009 - 2011 Happyworm Ltd + * Dual licensed under the MIT and GPL licenses. + * - http://www.opensource.org/licenses/mit-license.php + * - http://www.gnu.org/copyleft/gpl.html + * + * Author: Mark J Panaghiston + * Version: 2.1.0 + * Date: 1st September 2011 + */ + +/* Code verified using http://www.jshint.com/ */ +/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */ +/*global jQuery:false, ActiveXObject:false, alert:false */ + +(function($, undefined) { + + // Adapted from jquery.ui.widget.js (1.8.7): $.widget.bridge + $.fn.jPlayer = function( options ) { + var name = "jPlayer"; + var isMethodCall = typeof options === "string", + args = Array.prototype.slice.call( arguments, 1 ), + returnValue = this; + + // allow multiple hashes to be passed on init + options = !isMethodCall && args.length ? + $.extend.apply( null, [ true, options ].concat(args) ) : + options; + + // prevent calls to internal methods + if ( isMethodCall && options.charAt( 0 ) === "_" ) { + return returnValue; + } + + if ( isMethodCall ) { + this.each(function() { + var instance = $.data( this, name ), + methodValue = instance && $.isFunction( instance[options] ) ? + instance[ options ].apply( instance, args ) : + instance; + if ( methodValue !== instance && methodValue !== undefined ) { + returnValue = methodValue; + return false; + } + }); + } else { + this.each(function() { + var instance = $.data( this, name ); + if ( instance ) { + // instance.option( options || {} )._init(); // Orig jquery.ui.widget.js code: Not recommend for jPlayer. ie., Applying new options to an existing instance (via the jPlayer constructor) and performing the _init(). The _init() is what concerns me. It would leave a lot of event handlers acting on jPlayer instance and the interface. + instance.option( options || {} ); // The new constructor only changes the options. Changing options only has basic support atm. + } else { + $.data( this, name, new $.jPlayer( options, this ) ); + } + }); + } + + return returnValue; + }; + + $.jPlayer = function( options, element ) { + // allow instantiation without initializing for simple inheritance + if ( arguments.length ) { + this.element = $(element); + this.options = $.extend(true, {}, + this.options, + options + ); + var self = this; + this.element.bind( "remove.jPlayer", function() { + self.destroy(); + }); + this._init(); + } + }; + // End of: (Adapted from jquery.ui.widget.js (1.8.7)) + + // Emulated HTML5 methods and properties + $.jPlayer.emulateMethods = "load play pause"; + $.jPlayer.emulateStatus = "src readyState networkState currentTime duration paused ended playbackRate"; + $.jPlayer.emulateOptions = "muted volume"; + + // Reserved event names generated by jPlayer that are not part of the HTML5 Media element spec + $.jPlayer.reservedEvent = "ready flashreset resize repeat error warning"; + + // Events generated by jPlayer + $.jPlayer.event = { + ready: "jPlayer_ready", + flashreset: "jPlayer_flashreset", // Similar to the ready event if the Flash solution is set to display:none and then shown again or if it's reloaded for another reason by the browser. For example, using CSS position:fixed on Firefox for the full screen feature. + resize: "jPlayer_resize", // Occurs when the size changes through a full/restore screen operation or if the size/sizeFull options are changed. + repeat: "jPlayer_repeat", // Occurs when the repeat status changes. Usually through clicks on the repeat button of the interface. + click: "jPlayer_click", // Occurs when the user clicks on one of the following: poster image, html video, flash video. + error: "jPlayer_error", // Event error code in event.jPlayer.error.type. See $.jPlayer.error + warning: "jPlayer_warning", // Event warning code in event.jPlayer.warning.type. See $.jPlayer.warning + + // Other events match HTML5 spec. + loadstart: "jPlayer_loadstart", + progress: "jPlayer_progress", + suspend: "jPlayer_suspend", + abort: "jPlayer_abort", + emptied: "jPlayer_emptied", + stalled: "jPlayer_stalled", + play: "jPlayer_play", + pause: "jPlayer_pause", + loadedmetadata: "jPlayer_loadedmetadata", + loadeddata: "jPlayer_loadeddata", + waiting: "jPlayer_waiting", + playing: "jPlayer_playing", + canplay: "jPlayer_canplay", + canplaythrough: "jPlayer_canplaythrough", + seeking: "jPlayer_seeking", + seeked: "jPlayer_seeked", + timeupdate: "jPlayer_timeupdate", + ended: "jPlayer_ended", + ratechange: "jPlayer_ratechange", + durationchange: "jPlayer_durationchange", + volumechange: "jPlayer_volumechange" + }; + + $.jPlayer.htmlEvent = [ // These HTML events are bubbled through to the jPlayer event, without any internal action. + "loadstart", + // "progress", // jPlayer uses internally before bubbling. + // "suspend", // jPlayer uses internally before bubbling. + "abort", + // "error", // jPlayer uses internally before bubbling. + "emptied", + "stalled", + // "play", // jPlayer uses internally before bubbling. + // "pause", // jPlayer uses internally before bubbling. + "loadedmetadata", + "loadeddata", + // "waiting", // jPlayer uses internally before bubbling. + // "playing", // jPlayer uses internally before bubbling. + "canplay", + "canplaythrough", + // "seeking", // jPlayer uses internally before bubbling. + // "seeked", // jPlayer uses internally before bubbling. + // "timeupdate", // jPlayer uses internally before bubbling. + // "ended", // jPlayer uses internally before bubbling. + "ratechange" + // "durationchange" // jPlayer uses internally before bubbling. + // "volumechange" // jPlayer uses internally before bubbling. + ]; + + $.jPlayer.pause = function() { + $.each($.jPlayer.prototype.instances, function(i, element) { + if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event. + element.jPlayer("pause"); + } + }); + }; + + $.jPlayer.timeFormat = { + showHour: false, + showMin: true, + showSec: true, + padHour: false, + padMin: true, + padSec: true, + sepHour: ":", + sepMin: ":", + sepSec: "" + }; + + $.jPlayer.convertTime = function(s) { + var myTime = new Date(s * 1000); + var hour = myTime.getUTCHours(); + var min = myTime.getUTCMinutes(); + var sec = myTime.getUTCSeconds(); + var strHour = ($.jPlayer.timeFormat.padHour && hour < 10) ? "0" + hour : hour; + var strMin = ($.jPlayer.timeFormat.padMin && min < 10) ? "0" + min : min; + var strSec = ($.jPlayer.timeFormat.padSec && sec < 10) ? "0" + sec : sec; + return (($.jPlayer.timeFormat.showHour) ? strHour + $.jPlayer.timeFormat.sepHour : "") + (($.jPlayer.timeFormat.showMin) ? strMin + $.jPlayer.timeFormat.sepMin : "") + (($.jPlayer.timeFormat.showSec) ? strSec + $.jPlayer.timeFormat.sepSec : ""); + }; + + // Adapting jQuery 1.4.4 code for jQuery.browser. Required since jQuery 1.3.2 does not detect Chrome as webkit. + $.jPlayer.uaBrowser = function( userAgent ) { + var ua = userAgent.toLowerCase(); + + // Useragent RegExp + var rwebkit = /(webkit)[ \/]([\w.]+)/; + var ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/; + var rmsie = /(msie) ([\w.]+)/; + var rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/; + + var match = rwebkit.exec( ua ) || + ropera.exec( ua ) || + rmsie.exec( ua ) || + ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) || + []; + + return { browser: match[1] || "", version: match[2] || "0" }; + }; + + // Platform sniffer for detecting mobile devices + $.jPlayer.uaPlatform = function( userAgent ) { + var ua = userAgent.toLowerCase(); + + // Useragent RegExp + var rplatform = /(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/; + var rtablet = /(ipad|playbook)/; + var randroid = /(android)/; + var rmobile = /(mobile)/; + + var platform = rplatform.exec( ua ) || []; + var tablet = rtablet.exec( ua ) || + !rmobile.exec( ua ) && randroid.exec( ua ) || + []; + + if(platform[1]) { + platform[1] = platform[1].replace(/\s/g, "_"); // Change whitespace to underscore. Enables dot notation. + } + + return { platform: platform[1] || "", tablet: tablet[1] || "" }; + }; + + $.jPlayer.browser = { + }; + $.jPlayer.platform = { + }; + + var browserMatch = $.jPlayer.uaBrowser(navigator.userAgent); + if ( browserMatch.browser ) { + $.jPlayer.browser[ browserMatch.browser ] = true; + $.jPlayer.browser.version = browserMatch.version; + } + var platformMatch = $.jPlayer.uaPlatform(navigator.userAgent); + if ( platformMatch.platform ) { + $.jPlayer.platform[ platformMatch.platform ] = true; + $.jPlayer.platform.mobile = !platformMatch.tablet; + $.jPlayer.platform.tablet = !!platformMatch.tablet; + } + + $.jPlayer.prototype = { + count: 0, // Static Variable: Change it via prototype. + version: { // Static Object + script: "2.1.0", + needFlash: "2.1.0", + flash: "unknown" + }, + options: { // Instanced in $.jPlayer() constructor + swfPath: "js", // Path to Jplayer.swf. Can be relative, absolute or server root relative. + solution: "html, flash", // Valid solutions: html, flash. Order defines priority. 1st is highest, + supplied: "mp3", // Defines which formats jPlayer will try and support and the priority by the order. 1st is highest, + preload: 'metadata', // HTML5 Spec values: none, metadata, auto. + volume: 0.8, // The volume. Number 0 to 1. + muted: false, + wmode: "opaque", // Valid wmode: window, transparent, opaque, direct, gpu. + backgroundColor: "#000000", // To define the jPlayer div and Flash background color. + cssSelectorAncestor: "#jp_container_1", + cssSelector: { // * denotes properties that should only be required when video media type required. _cssSelector() would require changes to enable splitting these into Audio and Video defaults. + videoPlay: ".jp-video-play", // * + play: ".jp-play", + pause: ".jp-pause", + stop: ".jp-stop", + seekBar: ".jp-seek-bar", + playBar: ".jp-play-bar", + mute: ".jp-mute", + unmute: ".jp-unmute", + volumeBar: ".jp-volume-bar", + volumeBarValue: ".jp-volume-bar-value", + volumeMax: ".jp-volume-max", + currentTime: ".jp-current-time", + duration: ".jp-duration", + fullScreen: ".jp-full-screen", // * + restoreScreen: ".jp-restore-screen", // * + repeat: ".jp-repeat", + repeatOff: ".jp-repeat-off", + gui: ".jp-gui", // The interface used with autohide feature. + noSolution: ".jp-no-solution" // For error feedback when jPlayer cannot find a solution. + }, + fullScreen: false, + autohide: { + restored: false, // Controls the interface autohide feature. + full: true, // Controls the interface autohide feature. + fadeIn: 200, // Milliseconds. The period of the fadeIn anim. + fadeOut: 600, // Milliseconds. The period of the fadeOut anim. + hold: 1000 // Milliseconds. The period of the pause before autohide beings. + }, + loop: false, + repeat: function(event) { // The default jPlayer repeat event handler + if(event.jPlayer.options.loop) { + $(this).unbind(".jPlayerRepeat").bind($.jPlayer.event.ended + ".jPlayer.jPlayerRepeat", function() { + $(this).jPlayer("play"); + }); + } else { + $(this).unbind(".jPlayerRepeat"); + } + }, + nativeVideoControls: { + // Works well on standard browsers. + // Phone and tablet browsers can have problems with the controls disappearing. + }, + noFullScreen: { + msie: /msie [0-6]/, + ipad: /ipad.*?os [0-4]/, + iphone: /iphone/, + ipod: /ipod/, + android_pad: /android [0-3](?!.*?mobile)/, + android_phone: /android.*?mobile/, + blackberry: /blackberry/, + windows_ce: /windows ce/, + webos: /webos/ + }, + noVolume: { + ipad: /ipad/, + iphone: /iphone/, + ipod: /ipod/, + android_pad: /android(?!.*?mobile)/, + android_phone: /android.*?mobile/, + blackberry: /blackberry/, + windows_ce: /windows ce/, + webos: /webos/, + playbook: /playbook/ + }, + verticalVolume: false, // Calculate volume from the bottom of the volume bar. Default is from the left. Also volume affects either width or height. + // globalVolume: false, // Not implemented: Set to make volume changes affect all jPlayer instances + // globalMute: false, // Not implemented: Set to make mute changes affect all jPlayer instances + idPrefix: "jp", // Prefix for the ids of html elements created by jPlayer. For flash, this must not include characters: . - + * / \ + noConflict: "jQuery", + emulateHtml: false, // Emulates the HTML5 Media element on the jPlayer element. + errorAlerts: false, + warningAlerts: false + }, + optionsAudio: { + size: { + width: "0px", + height: "0px", + cssClass: "" + }, + sizeFull: { + width: "0px", + height: "0px", + cssClass: "" + } + }, + optionsVideo: { + size: { + width: "480px", + height: "270px", + cssClass: "jp-video-270p" + }, + sizeFull: { + width: "100%", + height: "100%", + cssClass: "jp-video-full" + } + }, + instances: {}, // Static Object + status: { // Instanced in _init() + src: "", + media: {}, + paused: true, + format: {}, + formatType: "", + waitForPlay: true, // Same as waitForLoad except in case where preloading. + waitForLoad: true, + srcSet: false, + video: false, // True if playing a video + seekPercent: 0, + currentPercentRelative: 0, + currentPercentAbsolute: 0, + currentTime: 0, + duration: 0, + readyState: 0, + networkState: 0, + playbackRate: 1, + ended: 0 + +/* Persistant status properties created dynamically at _init(): + width + height + cssClass + nativeVideoControls + noFullScreen + noVolume +*/ + }, + + internal: { // Instanced in _init() + ready: false + // instance: undefined + // domNode: undefined + // htmlDlyCmdId: undefined + // autohideId: undefined + }, + solution: { // Static Object: Defines the solutions built in jPlayer. + html: true, + flash: true + }, + // 'MPEG-4 support' : canPlayType('video/mp4; codecs="mp4v.20.8"') + format: { // Static Object + mp3: { + codec: 'audio/mpeg; codecs="mp3"', + flashCanPlay: true, + media: 'audio' + }, + m4a: { // AAC / MP4 + codec: 'audio/mp4; codecs="mp4a.40.2"', + flashCanPlay: true, + media: 'audio' + }, + oga: { // OGG + codec: 'audio/ogg; codecs="vorbis"', + flashCanPlay: false, + media: 'audio' + }, + wav: { // PCM + codec: 'audio/wav; codecs="1"', + flashCanPlay: false, + media: 'audio' + }, + webma: { // WEBM + codec: 'audio/webm; codecs="vorbis"', + flashCanPlay: false, + media: 'audio' + }, + fla: { // FLV / F4A + codec: 'audio/x-flv', + flashCanPlay: true, + media: 'audio' + }, + m4v: { // H.264 / MP4 + codec: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"', + flashCanPlay: true, + media: 'video' + }, + ogv: { // OGG + codec: 'video/ogg; codecs="theora, vorbis"', + flashCanPlay: false, + media: 'video' + }, + webmv: { // WEBM + codec: 'video/webm; codecs="vorbis, vp8"', + flashCanPlay: false, + media: 'video' + }, + flv: { // FLV / F4V + codec: 'video/x-flv', + flashCanPlay: true, + media: 'video' + } + }, + _init: function() { + var self = this; + + this.element.empty(); + + this.status = $.extend({}, this.status); // Copy static to unique instance. + this.internal = $.extend({}, this.internal); // Copy static to unique instance. + + this.internal.domNode = this.element.get(0); + + this.formats = []; // Array based on supplied string option. Order defines priority. + this.solutions = []; // Array based on solution string option. Order defines priority. + this.require = {}; // Which media types are required: video, audio. + + this.htmlElement = {}; // DOM elements created by jPlayer + this.html = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array. + this.html.audio = {}; + this.html.video = {}; + this.flash = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array. + + this.css = {}; + this.css.cs = {}; // Holds the css selector strings + this.css.jq = {}; // Holds jQuery selectors. ie., $(css.cs.method) + + this.ancestorJq = []; // Holds jQuery selector of cssSelectorAncestor. Init would use $() instead of [], but it is only 1.4+ + + this.options.volume = this._limitValue(this.options.volume, 0, 1); // Limit volume value's bounds. + + // Create the formats array, with prority based on the order of the supplied formats string + $.each(this.options.supplied.toLowerCase().split(","), function(index1, value1) { + var format = value1.replace(/^\s+|\s+$/g, ""); //trim + if(self.format[format]) { // Check format is valid. + var dupFound = false; + $.each(self.formats, function(index2, value2) { // Check for duplicates + if(format === value2) { + dupFound = true; + return false; + } + }); + if(!dupFound) { + self.formats.push(format); + } + } + }); + + // Create the solutions array, with prority based on the order of the solution string + $.each(this.options.solution.toLowerCase().split(","), function(index1, value1) { + var solution = value1.replace(/^\s+|\s+$/g, ""); //trim + if(self.solution[solution]) { // Check solution is valid. + var dupFound = false; + $.each(self.solutions, function(index2, value2) { // Check for duplicates + if(solution === value2) { + dupFound = true; + return false; + } + }); + if(!dupFound) { + self.solutions.push(solution); + } + } + }); + + this.internal.instance = "jp_" + this.count; + this.instances[this.internal.instance] = this.element; + + // Check the jPlayer div has an id and create one if required. Important for Flash to know the unique id for comms. + if(!this.element.attr("id")) { + this.element.attr("id", this.options.idPrefix + "_jplayer_" + this.count); + } + + this.internal.self = $.extend({}, { + id: this.element.attr("id"), + jq: this.element + }); + this.internal.audio = $.extend({}, { + id: this.options.idPrefix + "_audio_" + this.count, + jq: undefined + }); + this.internal.video = $.extend({}, { + id: this.options.idPrefix + "_video_" + this.count, + jq: undefined + }); + this.internal.flash = $.extend({}, { + id: this.options.idPrefix + "_flash_" + this.count, + jq: undefined, + swf: this.options.swfPath + (this.options.swfPath.toLowerCase().slice(-4) !== ".swf" ? (this.options.swfPath && this.options.swfPath.slice(-1) !== "/" ? "/" : "") + "Jplayer.swf" : "") + }); + this.internal.poster = $.extend({}, { + id: this.options.idPrefix + "_poster_" + this.count, + jq: undefined + }); + + // Register listeners defined in the constructor + $.each($.jPlayer.event, function(eventName,eventType) { + if(self.options[eventName] !== undefined) { + self.element.bind(eventType + ".jPlayer", self.options[eventName]); // With .jPlayer namespace. + self.options[eventName] = undefined; // Destroy the handler pointer copy on the options. Reason, events can be added/removed in other ways so this could be obsolete and misleading. + } + }); + + // Determine if we require solutions for audio, video or both media types. + this.require.audio = false; + this.require.video = false; + $.each(this.formats, function(priority, format) { + self.require[self.format[format].media] = true; + }); + + // Now required types are known, finish the options default settings. + if(this.require.video) { + this.options = $.extend(true, {}, + this.optionsVideo, + this.options + ); + } else { + this.options = $.extend(true, {}, + this.optionsAudio, + this.options + ); + } + this._setSize(); // update status and jPlayer element size + + // Determine the status for Blocklisted options. + this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls); + this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen); + this.status.noVolume = this._uaBlocklist(this.options.noVolume); + + // The native controls are only for video and are disabled when audio is also used. + this._restrictNativeVideoControls(); + + // Create the poster image. + this.htmlElement.poster = document.createElement('img'); + this.htmlElement.poster.id = this.internal.poster.id; + this.htmlElement.poster.onload = function() { // Note that this did not work on Firefox 3.6: poster.addEventListener("onload", function() {}, false); Did not investigate x-browser. + if(!self.status.video || self.status.waitForPlay) { + self.internal.poster.jq.show(); + } + }; + this.element.append(this.htmlElement.poster); + this.internal.poster.jq = $("#" + this.internal.poster.id); + this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height}); + this.internal.poster.jq.hide(); + this.internal.poster.jq.bind("click.jPlayer", function() { + self._trigger($.jPlayer.event.click); + }); + + // Generate the required media elements + this.html.audio.available = false; + if(this.require.audio) { // If a supplied format is audio + this.htmlElement.audio = document.createElement('audio'); + this.htmlElement.audio.id = this.internal.audio.id; + this.html.audio.available = !!this.htmlElement.audio.canPlayType && this._testCanPlayType(this.htmlElement.audio); // Test is for IE9 on Win Server 2008. + } + this.html.video.available = false; + if(this.require.video) { // If a supplied format is video + this.htmlElement.video = document.createElement('video'); + this.htmlElement.video.id = this.internal.video.id; + this.html.video.available = !!this.htmlElement.video.canPlayType && this._testCanPlayType(this.htmlElement.video); // Test is for IE9 on Win Server 2008. + } + + this.flash.available = this._checkForFlash(10); + + this.html.canPlay = {}; + this.flash.canPlay = {}; + $.each(this.formats, function(priority, format) { + self.html.canPlay[format] = self.html[self.format[format].media].available && "" !== self.htmlElement[self.format[format].media].canPlayType(self.format[format].codec); + self.flash.canPlay[format] = self.format[format].flashCanPlay && self.flash.available; + }); + this.html.desired = false; + this.flash.desired = false; + $.each(this.solutions, function(solutionPriority, solution) { + if(solutionPriority === 0) { + self[solution].desired = true; + } else { + var audioCanPlay = false; + var videoCanPlay = false; + $.each(self.formats, function(formatPriority, format) { + if(self[self.solutions[0]].canPlay[format]) { // The other solution can play + if(self.format[format].media === 'video') { + videoCanPlay = true; + } else { + audioCanPlay = true; + } + } + }); + self[solution].desired = (self.require.audio && !audioCanPlay) || (self.require.video && !videoCanPlay); + } + }); + // This is what jPlayer will support, based on solution and supplied. + this.html.support = {}; + this.flash.support = {}; + $.each(this.formats, function(priority, format) { + self.html.support[format] = self.html.canPlay[format] && self.html.desired; + self.flash.support[format] = self.flash.canPlay[format] && self.flash.desired; + }); + // If jPlayer is supporting any format in a solution, then the solution is used. + this.html.used = false; + this.flash.used = false; + $.each(this.solutions, function(solutionPriority, solution) { + $.each(self.formats, function(formatPriority, format) { + if(self[solution].support[format]) { + self[solution].used = true; + return false; + } + }); + }); + + // Init solution active state and the event gates to false. + this._resetActive(); + this._resetGate(); + + // Set up the css selectors for the control and feedback entities. + this._cssSelectorAncestor(this.options.cssSelectorAncestor); + + // If neither html nor flash are being used by this browser, then media playback is not possible. Trigger an error event. + if(!(this.html.used || this.flash.used)) { + this._error( { + type: $.jPlayer.error.NO_SOLUTION, + context: "{solution:'" + this.options.solution + "', supplied:'" + this.options.supplied + "'}", + message: $.jPlayer.errorMsg.NO_SOLUTION, + hint: $.jPlayer.errorHint.NO_SOLUTION + }); + if(this.css.jq.noSolution.length) { + this.css.jq.noSolution.show(); + } + } else { + if(this.css.jq.noSolution.length) { + this.css.jq.noSolution.hide(); + } + } + + // Add the flash solution if it is being used. + if(this.flash.used) { + var htmlObj, + flashVars = 'jQuery=' + encodeURI(this.options.noConflict) + '&id=' + encodeURI(this.internal.self.id) + '&vol=' + this.options.volume + '&muted=' + this.options.muted; + + // Code influenced by SWFObject 2.2: http://code.google.com/p/swfobject/ + // Non IE browsers have an initial Flash size of 1 by 1 otherwise the wmode affected the Flash ready event. + + if($.browser.msie && Number($.browser.version) <= 8) { + var objStr = ''; + + var paramStr = [ + '', + '', + '', + '', + '' + ]; + + htmlObj = document.createElement(objStr); + for(var i=0; i < paramStr.length; i++) { + htmlObj.appendChild(document.createElement(paramStr[i])); + } + } else { + var createParam = function(el, n, v) { + var p = document.createElement("param"); + p.setAttribute("name", n); + p.setAttribute("value", v); + el.appendChild(p); + }; + + htmlObj = document.createElement("object"); + htmlObj.setAttribute("id", this.internal.flash.id); + htmlObj.setAttribute("data", this.internal.flash.swf); + htmlObj.setAttribute("type", "application/x-shockwave-flash"); + htmlObj.setAttribute("width", "1"); // Non-zero + htmlObj.setAttribute("height", "1"); // Non-zero + createParam(htmlObj, "flashvars", flashVars); + createParam(htmlObj, "allowscriptaccess", "always"); + createParam(htmlObj, "bgcolor", this.options.backgroundColor); + createParam(htmlObj, "wmode", this.options.wmode); + } + + this.element.append(htmlObj); + this.internal.flash.jq = $(htmlObj); + } + + // Add the HTML solution if being used. + if(this.html.used) { + + // The HTML Audio handlers + if(this.html.audio.available) { + this._addHtmlEventListeners(this.htmlElement.audio, this.html.audio); + this.element.append(this.htmlElement.audio); + this.internal.audio.jq = $("#" + this.internal.audio.id); + } + + // The HTML Video handlers + if(this.html.video.available) { + this._addHtmlEventListeners(this.htmlElement.video, this.html.video); + this.element.append(this.htmlElement.video); + this.internal.video.jq = $("#" + this.internal.video.id); + if(this.status.nativeVideoControls) { + this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height}); + } else { + this.internal.video.jq.css({'width':'0px', 'height':'0px'}); // Using size 0x0 since a .hide() causes issues in iOS + } + this.internal.video.jq.bind("click.jPlayer", function() { + self._trigger($.jPlayer.event.click); + }); + } + } + + // Create the bridge that emulates the HTML Media element on the jPlayer DIV + if( this.options.emulateHtml ) { + this._emulateHtmlBridge(); + } + + if(this.html.used && !this.flash.used) { // If only HTML, then emulate flash ready() call after 100ms. + setTimeout( function() { + self.internal.ready = true; + self.version.flash = "n/a"; + self._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option. + self._trigger($.jPlayer.event.ready); + }, 100); + } + + // Initialize the interface components with the options. + this._updateNativeVideoControls(); // Must do this first, otherwise there is a bizarre bug in iOS 4.3.2, where the native controls are not shown. Fails in iOS if called after _updateButtons() below. Works if called later in setMedia too, so it odd. + this._updateInterface(); + this._updateButtons(false); + this._updateAutohide(); + this._updateVolume(this.options.volume); + this._updateMute(this.options.muted); + if(this.css.jq.videoPlay.length) { + this.css.jq.videoPlay.hide(); + } + + $.jPlayer.prototype.count++; // Change static variable via prototype. + }, + destroy: function() { + // MJP: The background change remains. Would need to store the original to restore it correctly. + // MJP: The jPlayer element's size change remains. + + // Clear the media to reset the GUI and stop any downloads. Streams on some browsers had persited. (Chrome) + this.clearMedia(); + // Remove the size/sizeFull cssClass from the cssSelectorAncestor + this._removeUiClass(); + // Remove the times from the GUI + if(this.css.jq.currentTime.length) { + this.css.jq.currentTime.text(""); + } + if(this.css.jq.duration.length) { + this.css.jq.duration.text(""); + } + // Remove any bindings from the interface controls. + $.each(this.css.jq, function(fn, jq) { + // Check selector is valid before trying to execute method. + if(jq.length) { + jq.unbind(".jPlayer"); + } + }); + // Remove the click handlers for $.jPlayer.event.click + this.internal.poster.jq.unbind(".jPlayer"); + if(this.internal.video.jq) { + this.internal.video.jq.unbind(".jPlayer"); + } + // Destroy the HTML bridge. + if(this.options.emulateHtml) { + this._destroyHtmlBridge(); + } + this.element.removeData("jPlayer"); // Remove jPlayer data + this.element.unbind(".jPlayer"); // Remove all event handlers created by the jPlayer constructor + this.element.empty(); // Remove the inserted child elements + + delete this.instances[this.internal.instance]; // Clear the instance on the static instance object + }, + enable: function() { // Plan to implement + // options.disabled = false + }, + disable: function () { // Plan to implement + // options.disabled = true + }, + _testCanPlayType: function(elem) { + // IE9 on Win Server 2008 did not implement canPlayType(), but it has the property. + try { + elem.canPlayType(this.format.mp3.codec); // The type is irrelevant. + return true; + } catch(err) { + return false; + } + }, + _uaBlocklist: function(list) { + // list : object with properties that are all regular expressions. Property names are irrelevant. + // Returns true if the user agent is matched in list. + var ua = navigator.userAgent.toLowerCase(), + block = false; + + $.each(list, function(p, re) { + if(re && re.test(ua)) { + block = true; + return false; // exit $.each. + } + }); + return block; + }, + _restrictNativeVideoControls: function() { + // Fallback to noFullScreen when nativeVideoControls is true and audio media is being used. Affects when both media types are used. + if(this.require.audio) { + if(this.status.nativeVideoControls) { + this.status.nativeVideoControls = false; + this.status.noFullScreen = true; + } + } + }, + _updateNativeVideoControls: function() { + if(this.html.video.available && this.html.used) { + // Turn the HTML Video controls on/off + this.htmlElement.video.controls = this.status.nativeVideoControls; + // Show/hide the jPlayer GUI. + this._updateAutohide(); + // For when option changed. The poster image is not updated, as it is dealt with in setMedia(). Acceptable degradation since seriously doubt these options will change on the fly. Can again review later. + if(this.status.nativeVideoControls && this.require.video) { + this.internal.poster.jq.hide(); + this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height}); + } else if(this.status.waitForPlay && this.status.video) { + this.internal.poster.jq.show(); + this.internal.video.jq.css({'width': '0px', 'height': '0px'}); + } + } + }, + _addHtmlEventListeners: function(mediaElement, entity) { + var self = this; + mediaElement.preload = this.options.preload; + mediaElement.muted = this.options.muted; + mediaElement.volume = this.options.volume; + + // Create the event listeners + // Only want the active entity to affect jPlayer and bubble events. + // Using entity.gate so that object is referenced and gate property always current + + mediaElement.addEventListener("progress", function() { + if(entity.gate) { + self._getHtmlStatus(mediaElement); + self._updateInterface(); + self._trigger($.jPlayer.event.progress); + } + }, false); + mediaElement.addEventListener("timeupdate", function() { + if(entity.gate) { + self._getHtmlStatus(mediaElement); + self._updateInterface(); + self._trigger($.jPlayer.event.timeupdate); + } + }, false); + mediaElement.addEventListener("durationchange", function() { + if(entity.gate) { + self.status.duration = this.duration; + self._getHtmlStatus(mediaElement); + self._updateInterface(); + self._trigger($.jPlayer.event.durationchange); + } + }, false); + mediaElement.addEventListener("play", function() { + if(entity.gate) { + self._updateButtons(true); + self._html_checkWaitForPlay(); // So the native controls update this variable and puts the hidden interface in the correct state. Affects toggling native controls. + self._trigger($.jPlayer.event.play); + } + }, false); + mediaElement.addEventListener("playing", function() { + if(entity.gate) { + self._updateButtons(true); + self._seeked(); + self._trigger($.jPlayer.event.playing); + } + }, false); + mediaElement.addEventListener("pause", function() { + if(entity.gate) { + self._updateButtons(false); + self._trigger($.jPlayer.event.pause); + } + }, false); + mediaElement.addEventListener("waiting", function() { + if(entity.gate) { + self._seeking(); + self._trigger($.jPlayer.event.waiting); + } + }, false); + mediaElement.addEventListener("seeking", function() { + if(entity.gate) { + self._seeking(); + self._trigger($.jPlayer.event.seeking); + } + }, false); + mediaElement.addEventListener("seeked", function() { + if(entity.gate) { + self._seeked(); + self._trigger($.jPlayer.event.seeked); + } + }, false); + mediaElement.addEventListener("volumechange", function() { + if(entity.gate) { + // Read the values back from the element as the Blackberry PlayBook shares the volume with the physical buttons master volume control. + // However, when tested 6th July 2011, those buttons do not generate an event. The physical play/pause button does though. + self.options.volume = mediaElement.volume; + self.options.muted = mediaElement.muted; + self._updateMute(); + self._updateVolume(); + self._trigger($.jPlayer.event.volumechange); + } + }, false); + mediaElement.addEventListener("suspend", function() { // Seems to be the only way of capturing that the iOS4 browser did not actually play the media from the page code. ie., It needs a user gesture. + if(entity.gate) { + self._seeked(); + self._trigger($.jPlayer.event.suspend); + } + }, false); + mediaElement.addEventListener("ended", function() { + if(entity.gate) { + // Order of the next few commands are important. Change the time and then pause. + // Solves a bug in Firefox, where issuing pause 1st causes the media to play from the start. ie., The pause is ignored. + if(!$.jPlayer.browser.webkit) { // Chrome crashes if you do this in conjunction with a setMedia command in an ended event handler. ie., The playlist demo. + self.htmlElement.media.currentTime = 0; // Safari does not care about this command. ie., It works with or without this line. (Both Safari and Chrome are Webkit.) + } + self.htmlElement.media.pause(); // Pause otherwise a click on the progress bar will play from that point, when it shouldn't, since it stopped playback. + self._updateButtons(false); + self._getHtmlStatus(mediaElement, true); // With override true. Otherwise Chrome leaves progress at full. + self._updateInterface(); + self._trigger($.jPlayer.event.ended); + } + }, false); + mediaElement.addEventListener("error", function() { + if(entity.gate) { + self._updateButtons(false); + self._seeked(); + if(self.status.srcSet) { // Deals with case of clearMedia() causing an error event. + clearTimeout(self.internal.htmlDlyCmdId); // Clears any delayed commands used in the HTML solution. + self.status.waitForLoad = true; // Allows the load operation to try again. + self.status.waitForPlay = true; // Reset since a play was captured. + if(self.status.video && !self.status.nativeVideoControls) { + self.internal.video.jq.css({'width':'0px', 'height':'0px'}); + } + if(self._validString(self.status.media.poster) && !self.status.nativeVideoControls) { + self.internal.poster.jq.show(); + } + if(self.css.jq.videoPlay.length) { + self.css.jq.videoPlay.show(); + } + self._error( { + type: $.jPlayer.error.URL, + context: self.status.src, // this.src shows absolute urls. Want context to show the url given. + message: $.jPlayer.errorMsg.URL, + hint: $.jPlayer.errorHint.URL + }); + } + } + }, false); + // Create all the other event listeners that bubble up to a jPlayer event from html, without being used by jPlayer. + $.each($.jPlayer.htmlEvent, function(i, eventType) { + mediaElement.addEventListener(this, function() { + if(entity.gate) { + self._trigger($.jPlayer.event[eventType]); + } + }, false); + }); + }, + _getHtmlStatus: function(media, override) { + var ct = 0, d = 0, cpa = 0, sp = 0, cpr = 0; + + if(media.duration) { // Fixes the duration bug in iOS, where the durationchange event occurs when media.duration is not always correct. + this.status.duration = media.duration; + } + ct = media.currentTime; + cpa = (this.status.duration > 0) ? 100 * ct / this.status.duration : 0; + if((typeof media.seekable === "object") && (media.seekable.length > 0)) { + sp = (this.status.duration > 0) ? 100 * media.seekable.end(media.seekable.length-1) / this.status.duration : 100; + cpr = 100 * media.currentTime / media.seekable.end(media.seekable.length-1); + } else { + sp = 100; + cpr = cpa; + } + + if(override) { + ct = 0; + cpr = 0; + cpa = 0; + } + + this.status.seekPercent = sp; + this.status.currentPercentRelative = cpr; + this.status.currentPercentAbsolute = cpa; + this.status.currentTime = ct; + + this.status.readyState = media.readyState; + this.status.networkState = media.networkState; + this.status.playbackRate = media.playbackRate; + this.status.ended = media.ended; + }, + _resetStatus: function() { + this.status = $.extend({}, this.status, $.jPlayer.prototype.status); // Maintains the status properties that persist through a reset. + }, + _trigger: function(eventType, error, warning) { // eventType always valid as called using $.jPlayer.event.eventType + var event = $.Event(eventType); + event.jPlayer = {}; + event.jPlayer.version = $.extend({}, this.version); + event.jPlayer.options = $.extend(true, {}, this.options); // Deep copy + event.jPlayer.status = $.extend(true, {}, this.status); // Deep copy + event.jPlayer.html = $.extend(true, {}, this.html); // Deep copy + event.jPlayer.flash = $.extend(true, {}, this.flash); // Deep copy + if(error) { + event.jPlayer.error = $.extend({}, error); + } + if(warning) { + event.jPlayer.warning = $.extend({}, warning); + } + this.element.trigger(event); + }, + jPlayerFlashEvent: function(eventType, status) { // Called from Flash + if(eventType === $.jPlayer.event.ready) { + if(!this.internal.ready) { + this.internal.ready = true; + this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Once Flash generates the ready event, minimise to zero as it is not affected by wmode anymore. + + this.version.flash = status.version; + if(this.version.needFlash !== this.version.flash) { + this._error( { + type: $.jPlayer.error.VERSION, + context: this.version.flash, + message: $.jPlayer.errorMsg.VERSION + this.version.flash, + hint: $.jPlayer.errorHint.VERSION + }); + } + this._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option. + this._trigger(eventType); + } else { + // This condition occurs if the Flash is hidden and then shown again. + // Firefox also reloads the Flash if the CSS position changes. position:fixed is used for full screen. + + // Only do this if the Flash is the solution being used at the moment. Affects Media players where both solution may be being used. + if(this.flash.gate) { + + // Send the current status to the Flash now that it is ready (available) again. + if(this.status.srcSet) { + + // Need to read original status before issuing the setMedia command. + var currentTime = this.status.currentTime, + paused = this.status.paused; + + this.setMedia(this.status.media); + if(currentTime > 0) { + if(paused) { + this.pause(currentTime); + } else { + this.play(currentTime); + } + } + } + this._trigger($.jPlayer.event.flashreset); + } + } + } + if(this.flash.gate) { + switch(eventType) { + case $.jPlayer.event.progress: + this._getFlashStatus(status); + this._updateInterface(); + this._trigger(eventType); + break; + case $.jPlayer.event.timeupdate: + this._getFlashStatus(status); + this._updateInterface(); + this._trigger(eventType); + break; + case $.jPlayer.event.play: + this._seeked(); + this._updateButtons(true); + this._trigger(eventType); + break; + case $.jPlayer.event.pause: + this._updateButtons(false); + this._trigger(eventType); + break; + case $.jPlayer.event.ended: + this._updateButtons(false); + this._trigger(eventType); + break; + case $.jPlayer.event.click: + this._trigger(eventType); // This could be dealt with by the default + break; + case $.jPlayer.event.error: + this.status.waitForLoad = true; // Allows the load operation to try again. + this.status.waitForPlay = true; // Reset since a play was captured. + if(this.status.video) { + this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); + } + if(this._validString(this.status.media.poster)) { + this.internal.poster.jq.show(); + } + if(this.css.jq.videoPlay.length && this.status.video) { + this.css.jq.videoPlay.show(); + } + if(this.status.video) { // Set up for another try. Execute before error event. + this._flash_setVideo(this.status.media); + } else { + this._flash_setAudio(this.status.media); + } + this._updateButtons(false); + this._error( { + type: $.jPlayer.error.URL, + context:status.src, + message: $.jPlayer.errorMsg.URL, + hint: $.jPlayer.errorHint.URL + }); + break; + case $.jPlayer.event.seeking: + this._seeking(); + this._trigger(eventType); + break; + case $.jPlayer.event.seeked: + this._seeked(); + this._trigger(eventType); + break; + case $.jPlayer.event.ready: + // The ready event is handled outside the switch statement. + // Captured here otherwise 2 ready events would be generated if the ready event handler used setMedia. + break; + default: + this._trigger(eventType); + } + } + return false; + }, + _getFlashStatus: function(status) { + this.status.seekPercent = status.seekPercent; + this.status.currentPercentRelative = status.currentPercentRelative; + this.status.currentPercentAbsolute = status.currentPercentAbsolute; + this.status.currentTime = status.currentTime; + this.status.duration = status.duration; + + // The Flash does not generate this information in this release + this.status.readyState = 4; // status.readyState; + this.status.networkState = 0; // status.networkState; + this.status.playbackRate = 1; // status.playbackRate; + this.status.ended = false; // status.ended; + }, + _updateButtons: function(playing) { + if(playing !== undefined) { + this.status.paused = !playing; + if(this.css.jq.play.length && this.css.jq.pause.length) { + if(playing) { + this.css.jq.play.hide(); + this.css.jq.pause.show(); + } else { + this.css.jq.play.show(); + this.css.jq.pause.hide(); + } + } + } + if(this.css.jq.restoreScreen.length && this.css.jq.fullScreen.length) { + if(this.status.noFullScreen) { + this.css.jq.fullScreen.hide(); + this.css.jq.restoreScreen.hide(); + } else if(this.options.fullScreen) { + this.css.jq.fullScreen.hide(); + this.css.jq.restoreScreen.show(); + } else { + this.css.jq.fullScreen.show(); + this.css.jq.restoreScreen.hide(); + } + } + if(this.css.jq.repeat.length && this.css.jq.repeatOff.length) { + if(this.options.loop) { + this.css.jq.repeat.hide(); + this.css.jq.repeatOff.show(); + } else { + this.css.jq.repeat.show(); + this.css.jq.repeatOff.hide(); + } + } + }, + _updateInterface: function() { + if(this.css.jq.seekBar.length) { + this.css.jq.seekBar.width(this.status.seekPercent+"%"); + } + if(this.css.jq.playBar.length) { + this.css.jq.playBar.width(this.status.currentPercentRelative+"%"); + } + if(this.css.jq.currentTime.length) { + this.css.jq.currentTime.text($.jPlayer.convertTime(this.status.currentTime)); + } + if(this.css.jq.duration.length) { + this.css.jq.duration.text($.jPlayer.convertTime(this.status.duration)); + } + }, + _seeking: function() { + if(this.css.jq.seekBar.length) { + this.css.jq.seekBar.addClass("jp-seeking-bg"); + } + }, + _seeked: function() { + if(this.css.jq.seekBar.length) { + this.css.jq.seekBar.removeClass("jp-seeking-bg"); + } + }, + _resetGate: function() { + this.html.audio.gate = false; + this.html.video.gate = false; + this.flash.gate = false; + }, + _resetActive: function() { + this.html.active = false; + this.flash.active = false; + }, + setMedia: function(media) { + + /* media[format] = String: URL of format. Must contain all of the supplied option's video or audio formats. + * media.poster = String: Video poster URL. + * media.subtitles = String: * NOT IMPLEMENTED * URL of subtitles SRT file + * media.chapters = String: * NOT IMPLEMENTED * URL of chapters SRT file + * media.stream = Boolean: * NOT IMPLEMENTED * Designating actual media streams. ie., "false/undefined" for files. Plan to refresh the flash every so often. + */ + + var self = this, + supported = false, + posterChanged = this.status.media.poster !== media.poster; // Compare before reset. Important for OSX Safari as this.htmlElement.poster.src is absolute, even if original poster URL was relative. + + this._resetMedia(); + this._resetGate(); + this._resetActive(); + + $.each(this.formats, function(formatPriority, format) { + var isVideo = self.format[format].media === 'video'; + $.each(self.solutions, function(solutionPriority, solution) { + if(self[solution].support[format] && self._validString(media[format])) { // Format supported in solution and url given for format. + var isHtml = solution === 'html'; + + if(isVideo) { + if(isHtml) { + self.html.video.gate = true; + self._html_setVideo(media); + self.html.active = true; + } else { + self.flash.gate = true; + self._flash_setVideo(media); + self.flash.active = true; + } + if(self.css.jq.videoPlay.length) { + self.css.jq.videoPlay.show(); + } + self.status.video = true; + } else { + if(isHtml) { + self.html.audio.gate = true; + self._html_setAudio(media); + self.html.active = true; + } else { + self.flash.gate = true; + self._flash_setAudio(media); + self.flash.active = true; + } + if(self.css.jq.videoPlay.length) { + self.css.jq.videoPlay.hide(); + } + self.status.video = false; + } + + supported = true; + return false; // Exit $.each + } + }); + if(supported) { + return false; // Exit $.each + } + }); + + if(supported) { + if(!(this.status.nativeVideoControls && this.html.video.gate)) { + // Set poster IMG if native video controls are not being used + // Note: With IE the IMG onload event occurs immediately when cached. + // Note: Poster hidden by default in _resetMedia() + if(this._validString(media.poster)) { + if(posterChanged) { // Since some browsers do not generate img onload event. + this.htmlElement.poster.src = media.poster; + } else { + this.internal.poster.jq.show(); + } + } + } + this.status.srcSet = true; + this.status.media = $.extend({}, media); + this._updateButtons(false); + this._updateInterface(); + } else { // jPlayer cannot support any formats provided in this browser + // Send an error event + this._error( { + type: $.jPlayer.error.NO_SUPPORT, + context: "{supplied:'" + this.options.supplied + "'}", + message: $.jPlayer.errorMsg.NO_SUPPORT, + hint: $.jPlayer.errorHint.NO_SUPPORT + }); + } + }, + _resetMedia: function() { + this._resetStatus(); + this._updateButtons(false); + this._updateInterface(); + this._seeked(); + this.internal.poster.jq.hide(); + + clearTimeout(this.internal.htmlDlyCmdId); + + if(this.html.active) { + this._html_resetMedia(); + } else if(this.flash.active) { + this._flash_resetMedia(); + } + }, + clearMedia: function() { + this._resetMedia(); + + if(this.html.active) { + this._html_clearMedia(); + } else if(this.flash.active) { + this._flash_clearMedia(); + } + + this._resetGate(); + this._resetActive(); + }, + load: function() { + if(this.status.srcSet) { + if(this.html.active) { + this._html_load(); + } else if(this.flash.active) { + this._flash_load(); + } + } else { + this._urlNotSetError("load"); + } + }, + play: function(time) { + time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler + if(this.status.srcSet) { + if(this.html.active) { + this._html_play(time); + } else if(this.flash.active) { + this._flash_play(time); + } + } else { + this._urlNotSetError("play"); + } + }, + videoPlay: function(e) { // Handles clicks on the play button over the video poster + this.play(); + }, + pause: function(time) { + time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler + if(this.status.srcSet) { + if(this.html.active) { + this._html_pause(time); + } else if(this.flash.active) { + this._flash_pause(time); + } + } else { + this._urlNotSetError("pause"); + } + }, + pauseOthers: function() { + var self = this; + $.each(this.instances, function(i, element) { + if(self.element !== element) { // Do not this instance. + if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event. + element.jPlayer("pause"); + } + } + }); + }, + stop: function() { + if(this.status.srcSet) { + if(this.html.active) { + this._html_pause(0); + } else if(this.flash.active) { + this._flash_pause(0); + } + } else { + this._urlNotSetError("stop"); + } + }, + playHead: function(p) { + p = this._limitValue(p, 0, 100); + if(this.status.srcSet) { + if(this.html.active) { + this._html_playHead(p); + } else if(this.flash.active) { + this._flash_playHead(p); + } + } else { + this._urlNotSetError("playHead"); + } + }, + _muted: function(muted) { + this.options.muted = muted; + if(this.html.used) { + this._html_mute(muted); + } + if(this.flash.used) { + this._flash_mute(muted); + } + + // The HTML solution generates this event from the media element itself. + if(!this.html.video.gate && !this.html.audio.gate) { + this._updateMute(muted); + this._updateVolume(this.options.volume); + this._trigger($.jPlayer.event.volumechange); + } + }, + mute: function(mute) { // mute is either: undefined (true), an event object (true) or a boolean (muted). + mute = mute === undefined ? true : !!mute; + this._muted(mute); + }, + unmute: function(unmute) { // unmute is either: undefined (true), an event object (true) or a boolean (!muted). + unmute = unmute === undefined ? true : !!unmute; + this._muted(!unmute); + }, + _updateMute: function(mute) { + if(mute === undefined) { + mute = this.options.muted; + } + if(this.css.jq.mute.length && this.css.jq.unmute.length) { + if(this.status.noVolume) { + this.css.jq.mute.hide(); + this.css.jq.unmute.hide(); + } else if(mute) { + this.css.jq.mute.hide(); + this.css.jq.unmute.show(); + } else { + this.css.jq.mute.show(); + this.css.jq.unmute.hide(); + } + } + }, + volume: function(v) { + v = this._limitValue(v, 0, 1); + this.options.volume = v; + + if(this.html.used) { + this._html_volume(v); + } + if(this.flash.used) { + this._flash_volume(v); + } + + // The HTML solution generates this event from the media element itself. + if(!this.html.video.gate && !this.html.audio.gate) { + this._updateVolume(v); + this._trigger($.jPlayer.event.volumechange); + } + }, + volumeBar: function(e) { // Handles clicks on the volumeBar + if(this.css.jq.volumeBar.length) { + var offset = this.css.jq.volumeBar.offset(), + x = e.pageX - offset.left, + w = this.css.jq.volumeBar.width(), + y = this.css.jq.volumeBar.height() - e.pageY + offset.top, + h = this.css.jq.volumeBar.height(); + + if(this.options.verticalVolume) { + this.volume(y/h); + } else { + this.volume(x/w); + } + } + if(this.options.muted) { + this._muted(false); + } + }, + volumeBarValue: function(e) { // Handles clicks on the volumeBarValue + this.volumeBar(e); + }, + _updateVolume: function(v) { + if(v === undefined) { + v = this.options.volume; + } + v = this.options.muted ? 0 : v; + + if(this.status.noVolume) { + if(this.css.jq.volumeBar.length) { + this.css.jq.volumeBar.hide(); + } + if(this.css.jq.volumeBarValue.length) { + this.css.jq.volumeBarValue.hide(); + } + if(this.css.jq.volumeMax.length) { + this.css.jq.volumeMax.hide(); + } + } else { + if(this.css.jq.volumeBar.length) { + this.css.jq.volumeBar.show(); + } + if(this.css.jq.volumeBarValue.length) { + this.css.jq.volumeBarValue.show(); + this.css.jq.volumeBarValue[this.options.verticalVolume ? "height" : "width"]((v*100)+"%"); + } + if(this.css.jq.volumeMax.length) { + this.css.jq.volumeMax.show(); + } + } + }, + volumeMax: function() { // Handles clicks on the volume max + this.volume(1); + if(this.options.muted) { + this._muted(false); + } + }, + _cssSelectorAncestor: function(ancestor) { + var self = this; + this.options.cssSelectorAncestor = ancestor; + this._removeUiClass(); + this.ancestorJq = ancestor ? $(ancestor) : []; // Would use $() instead of [], but it is only 1.4+ + if(ancestor && this.ancestorJq.length !== 1) { // So empty strings do not generate the warning. + this._warning( { + type: $.jPlayer.warning.CSS_SELECTOR_COUNT, + context: ancestor, + message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.ancestorJq.length + " found for cssSelectorAncestor.", + hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT + }); + } + this._addUiClass(); + $.each(this.options.cssSelector, function(fn, cssSel) { + self._cssSelector(fn, cssSel); + }); + }, + _cssSelector: function(fn, cssSel) { + var self = this; + if(typeof cssSel === 'string') { + if($.jPlayer.prototype.options.cssSelector[fn]) { + if(this.css.jq[fn] && this.css.jq[fn].length) { + this.css.jq[fn].unbind(".jPlayer"); + } + this.options.cssSelector[fn] = cssSel; + this.css.cs[fn] = this.options.cssSelectorAncestor + " " + cssSel; + + if(cssSel) { // Checks for empty string + this.css.jq[fn] = $(this.css.cs[fn]); + } else { + this.css.jq[fn] = []; // To comply with the css.jq[fn].length check before its use. As of jQuery 1.4 could have used $() for an empty set. + } + + if(this.css.jq[fn].length) { + var handler = function(e) { + self[fn](e); + $(this).blur(); + return false; + }; + this.css.jq[fn].bind("click.jPlayer", handler); // Using jPlayer namespace + } + + if(cssSel && this.css.jq[fn].length !== 1) { // So empty strings do not generate the warning. ie., they just remove the old one. + this._warning( { + type: $.jPlayer.warning.CSS_SELECTOR_COUNT, + context: this.css.cs[fn], + message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.css.jq[fn].length + " found for " + fn + " method.", + hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT + }); + } + } else { + this._warning( { + type: $.jPlayer.warning.CSS_SELECTOR_METHOD, + context: fn, + message: $.jPlayer.warningMsg.CSS_SELECTOR_METHOD, + hint: $.jPlayer.warningHint.CSS_SELECTOR_METHOD + }); + } + } else { + this._warning( { + type: $.jPlayer.warning.CSS_SELECTOR_STRING, + context: cssSel, + message: $.jPlayer.warningMsg.CSS_SELECTOR_STRING, + hint: $.jPlayer.warningHint.CSS_SELECTOR_STRING + }); + } + }, + seekBar: function(e) { // Handles clicks on the seekBar + if(this.css.jq.seekBar) { + var offset = this.css.jq.seekBar.offset(); + var x = e.pageX - offset.left; + var w = this.css.jq.seekBar.width(); + var p = 100*x/w; + this.playHead(p); + } + }, + playBar: function(e) { // Handles clicks on the playBar + this.seekBar(e); + }, + repeat: function() { // Handle clicks on the repeat button + this._loop(true); + }, + repeatOff: function() { // Handle clicks on the repeatOff button + this._loop(false); + }, + _loop: function(loop) { + if(this.options.loop !== loop) { + this.options.loop = loop; + this._updateButtons(); + this._trigger($.jPlayer.event.repeat); + } + }, + + // Plan to review the cssSelector method to cope with missing associated functions accordingly. + + currentTime: function(e) { // Handles clicks on the text + // Added to avoid errors using cssSelector system for the text + }, + duration: function(e) { // Handles clicks on the text + // Added to avoid errors using cssSelector system for the text + }, + gui: function(e) { // Handles clicks on the gui + // Added to avoid errors using cssSelector system for the gui + }, + noSolution: function(e) { // Handles clicks on the error message + // Added to avoid errors using cssSelector system for no-solution + }, + + // Options code adapted from ui.widget.js (1.8.7). Made changes so the key can use dot notation. To match previous getData solution in jPlayer 1. + option: function(key, value) { + var options = key; + + // Enables use: options(). Returns a copy of options object + if ( arguments.length === 0 ) { + return $.extend( true, {}, this.options ); + } + + if(typeof key === "string") { + var keys = key.split("."); + + // Enables use: options("someOption") Returns a copy of the option. Supports dot notation. + if(value === undefined) { + + var opt = $.extend(true, {}, this.options); + for(var i = 0; i < keys.length; i++) { + if(opt[keys[i]] !== undefined) { + opt = opt[keys[i]]; + } else { + this._warning( { + type: $.jPlayer.warning.OPTION_KEY, + context: key, + message: $.jPlayer.warningMsg.OPTION_KEY, + hint: $.jPlayer.warningHint.OPTION_KEY + }); + return undefined; + } + } + return opt; + } + + // Enables use: options("someOptionObject", someObject}). Creates: {someOptionObject:someObject} + // Enables use: options("someOption", someValue). Creates: {someOption:someValue} + // Enables use: options("someOptionObject.someOption", someValue). Creates: {someOptionObject:{someOption:someValue}} + + options = {}; + var opts = options; + + for(var j = 0; j < keys.length; j++) { + if(j < keys.length - 1) { + opts[keys[j]] = {}; + opts = opts[keys[j]]; + } else { + opts[keys[j]] = value; + } + } + } + + // Otherwise enables use: options(optionObject). Uses original object (the key) + + this._setOptions(options); + + return this; + }, + _setOptions: function(options) { + var self = this; + $.each(options, function(key, value) { // This supports the 2 level depth that the options of jPlayer has. Would review if we ever need more depth. + self._setOption(key, value); + }); + + return this; + }, + _setOption: function(key, value) { + var self = this; + + // The ability to set options is limited at this time. + + switch(key) { + case "volume" : + this.volume(value); + break; + case "muted" : + this._muted(value); + break; + case "cssSelectorAncestor" : + this._cssSelectorAncestor(value); // Set and refresh all associations for the new ancestor. + break; + case "cssSelector" : + $.each(value, function(fn, cssSel) { + self._cssSelector(fn, cssSel); // NB: The option is set inside this function, after further validity checks. + }); + break; + case "fullScreen" : + if(this.options[key] !== value) { // if changed + this._removeUiClass(); + this.options[key] = value; + this._refreshSize(); + } + break; + case "size" : + if(!this.options.fullScreen && this.options[key].cssClass !== value.cssClass) { + this._removeUiClass(); + } + this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed. + this._refreshSize(); + break; + case "sizeFull" : + if(this.options.fullScreen && this.options[key].cssClass !== value.cssClass) { + this._removeUiClass(); + } + this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed. + this._refreshSize(); + break; + case "autohide" : + this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed. + this._updateAutohide(); + break; + case "loop" : + this._loop(value); + break; + case "nativeVideoControls" : + this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed. + this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls); + this._restrictNativeVideoControls(); + this._updateNativeVideoControls(); + break; + case "noFullScreen" : + this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed. + this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls); // Need to check again as noFullScreen can depend on this flag and the restrict() can override it. + this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen); + this._restrictNativeVideoControls(); + this._updateButtons(); + break; + case "noVolume" : + this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed. + this.status.noVolume = this._uaBlocklist(this.options.noVolume); + this._updateVolume(); + this._updateMute(); + break; + case "emulateHtml" : + if(this.options[key] !== value) { // To avoid multiple event handlers being created, if true already. + this.options[key] = value; + if(value) { + this._emulateHtmlBridge(); + } else { + this._destroyHtmlBridge(); + } + } + break; + } + + return this; + }, + // End of: (Options code adapted from ui.widget.js) + + _refreshSize: function() { + this._setSize(); // update status and jPlayer element size + this._addUiClass(); // update the ui class + this._updateSize(); // update internal sizes + this._updateButtons(); + this._updateAutohide(); + this._trigger($.jPlayer.event.resize); + }, + _setSize: function() { + // Determine the current size from the options + if(this.options.fullScreen) { + this.status.width = this.options.sizeFull.width; + this.status.height = this.options.sizeFull.height; + this.status.cssClass = this.options.sizeFull.cssClass; + } else { + this.status.width = this.options.size.width; + this.status.height = this.options.size.height; + this.status.cssClass = this.options.size.cssClass; + } + + // Set the size of the jPlayer area. + this.element.css({'width': this.status.width, 'height': this.status.height}); + }, + _addUiClass: function() { + if(this.ancestorJq.length) { + this.ancestorJq.addClass(this.status.cssClass); + } + }, + _removeUiClass: function() { + if(this.ancestorJq.length) { + this.ancestorJq.removeClass(this.status.cssClass); + } + }, + _updateSize: function() { + // The poster uses show/hide so can simply resize it. + this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height}); + + // Video html or flash resized if necessary at this time, or if native video controls being used. + if(!this.status.waitForPlay && this.html.active && this.status.video || this.html.video.available && this.html.used && this.status.nativeVideoControls) { + this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height}); + } + else if(!this.status.waitForPlay && this.flash.active && this.status.video) { + this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height}); + } + }, + _updateAutohide: function() { + var self = this, + event = "mousemove.jPlayer", + namespace = ".jPlayerAutohide", + eventType = event + namespace, + handler = function() { + self.css.jq.gui.fadeIn(self.options.autohide.fadeIn, function() { + clearTimeout(self.internal.autohideId); + self.internal.autohideId = setTimeout( function() { + self.css.jq.gui.fadeOut(self.options.autohide.fadeOut); + }, self.options.autohide.hold); + }); + }; + + if(this.css.jq.gui.length) { + + // End animations first so that its callback is executed now. + // Otherwise an in progress fadeIn animation still has the callback to fadeOut again. + this.css.jq.gui.stop(true, true); + + // Removes the fadeOut operation from the fadeIn callback. + clearTimeout(this.internal.autohideId); + + this.element.unbind(namespace); + this.css.jq.gui.unbind(namespace); + + if(!this.status.nativeVideoControls) { + if(this.options.fullScreen && this.options.autohide.full || !this.options.fullScreen && this.options.autohide.restored) { + this.element.bind(eventType, handler); + this.css.jq.gui.bind(eventType, handler); + this.css.jq.gui.hide(); + } else { + this.css.jq.gui.show(); + } + } else { + this.css.jq.gui.hide(); + } + } + }, + fullScreen: function() { + this._setOption("fullScreen", true); + }, + restoreScreen: function() { + this._setOption("fullScreen", false); + }, + _html_initMedia: function() { + this.htmlElement.media.src = this.status.src; + + if(this.options.preload !== 'none') { + this._html_load(); // See function for comments + } + this._trigger($.jPlayer.event.timeupdate); // The flash generates this event for its solution. + }, + _html_setAudio: function(media) { + var self = this; + // Always finds a format due to checks in setMedia() + $.each(this.formats, function(priority, format) { + if(self.html.support[format] && media[format]) { + self.status.src = media[format]; + self.status.format[format] = true; + self.status.formatType = format; + return false; + } + }); + this.htmlElement.media = this.htmlElement.audio; + this._html_initMedia(); + }, + _html_setVideo: function(media) { + var self = this; + // Always finds a format due to checks in setMedia() + $.each(this.formats, function(priority, format) { + if(self.html.support[format] && media[format]) { + self.status.src = media[format]; + self.status.format[format] = true; + self.status.formatType = format; + return false; + } + }); + if(this.status.nativeVideoControls) { + this.htmlElement.video.poster = this._validString(media.poster) ? media.poster : ""; + } + this.htmlElement.media = this.htmlElement.video; + this._html_initMedia(); + }, + _html_resetMedia: function() { + if(this.htmlElement.media) { + if(this.htmlElement.media.id === this.internal.video.id && !this.status.nativeVideoControls) { + this.internal.video.jq.css({'width':'0px', 'height':'0px'}); + } + this.htmlElement.media.pause(); + } + }, + _html_clearMedia: function() { + if(this.htmlElement.media) { + this.htmlElement.media.src = ""; + this.htmlElement.media.load(); // Stops an old, "in progress" download from continuing the download. Triggers the loadstart, error and emptied events, due to the empty src. Also an abort event if a download was in progress. + } + }, + _html_load: function() { + // This function remains to allow the early HTML5 browsers to work, such as Firefox 3.6 + // A change in the W3C spec for the media.load() command means that this is no longer necessary. + // This command should be removed and actually causes minor undesirable effects on some browsers. Such as loading the whole file and not only the metadata. + if(this.status.waitForLoad) { + this.status.waitForLoad = false; + this.htmlElement.media.load(); + } + clearTimeout(this.internal.htmlDlyCmdId); + }, + _html_play: function(time) { + var self = this; + this._html_load(); // Loads if required and clears any delayed commands. + + this.htmlElement.media.play(); // Before currentTime attempt otherwise Firefox 4 Beta never loads. + + if(!isNaN(time)) { + try { + this.htmlElement.media.currentTime = time; + } catch(err) { + this.internal.htmlDlyCmdId = setTimeout(function() { + self.play(time); + }, 100); + return; // Cancel execution and wait for the delayed command. + } + } + this._html_checkWaitForPlay(); + }, + _html_pause: function(time) { + var self = this; + + if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation. + this._html_load(); // Loads if required and clears any delayed commands. + } else { + clearTimeout(this.internal.htmlDlyCmdId); + } + + // Order of these commands is important for Safari (Win) and IE9. Pause then change currentTime. + this.htmlElement.media.pause(); + + if(!isNaN(time)) { + try { + this.htmlElement.media.currentTime = time; + } catch(err) { + this.internal.htmlDlyCmdId = setTimeout(function() { + self.pause(time); + }, 100); + return; // Cancel execution and wait for the delayed command. + } + } + if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button. + this._html_checkWaitForPlay(); + } + }, + _html_playHead: function(percent) { + var self = this; + this._html_load(); // Loads if required and clears any delayed commands. + try { + if((typeof this.htmlElement.media.seekable === "object") && (this.htmlElement.media.seekable.length > 0)) { + this.htmlElement.media.currentTime = percent * this.htmlElement.media.seekable.end(this.htmlElement.media.seekable.length-1) / 100; + } else if(this.htmlElement.media.duration > 0 && !isNaN(this.htmlElement.media.duration)) { + this.htmlElement.media.currentTime = percent * this.htmlElement.media.duration / 100; + } else { + throw "e"; + } + } catch(err) { + this.internal.htmlDlyCmdId = setTimeout(function() { + self.playHead(percent); + }, 100); + return; // Cancel execution and wait for the delayed command. + } + if(!this.status.waitForLoad) { + this._html_checkWaitForPlay(); + } + }, + _html_checkWaitForPlay: function() { + if(this.status.waitForPlay) { + this.status.waitForPlay = false; + if(this.css.jq.videoPlay.length) { + this.css.jq.videoPlay.hide(); + } + if(this.status.video) { + this.internal.poster.jq.hide(); + this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height}); + } + } + }, + _html_volume: function(v) { + if(this.html.audio.available) { + this.htmlElement.audio.volume = v; + } + if(this.html.video.available) { + this.htmlElement.video.volume = v; + } + }, + _html_mute: function(m) { + if(this.html.audio.available) { + this.htmlElement.audio.muted = m; + } + if(this.html.video.available) { + this.htmlElement.video.muted = m; + } + }, + _flash_setAudio: function(media) { + var self = this; + try { + // Always finds a format due to checks in setMedia() + $.each(this.formats, function(priority, format) { + if(self.flash.support[format] && media[format]) { + switch (format) { + case "m4a" : + case "fla" : + self._getMovie().fl_setAudio_m4a(media[format]); + break; + case "mp3" : + self._getMovie().fl_setAudio_mp3(media[format]); + break; + } + self.status.src = media[format]; + self.status.format[format] = true; + self.status.formatType = format; + return false; + } + }); + + if(this.options.preload === 'auto') { + this._flash_load(); + this.status.waitForLoad = false; + } + } catch(err) { this._flashError(err); } + }, + _flash_setVideo: function(media) { + var self = this; + try { + // Always finds a format due to checks in setMedia() + $.each(this.formats, function(priority, format) { + if(self.flash.support[format] && media[format]) { + switch (format) { + case "m4v" : + case "flv" : + self._getMovie().fl_setVideo_m4v(media[format]); + break; + } + self.status.src = media[format]; + self.status.format[format] = true; + self.status.formatType = format; + return false; + } + }); + + if(this.options.preload === 'auto') { + this._flash_load(); + this.status.waitForLoad = false; + } + } catch(err) { this._flashError(err); } + }, + _flash_resetMedia: function() { + this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Must do via CSS as setting attr() to zero causes a jQuery error in IE. + this._flash_pause(NaN); + }, + _flash_clearMedia: function() { + try { + this._getMovie().fl_clearMedia(); + } catch(err) { this._flashError(err); } + }, + _flash_load: function() { + try { + this._getMovie().fl_load(); + } catch(err) { this._flashError(err); } + this.status.waitForLoad = false; + }, + _flash_play: function(time) { + try { + this._getMovie().fl_play(time); + } catch(err) { this._flashError(err); } + this.status.waitForLoad = false; + this._flash_checkWaitForPlay(); + }, + _flash_pause: function(time) { + try { + this._getMovie().fl_pause(time); + } catch(err) { this._flashError(err); } + if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button. + this.status.waitForLoad = false; + this._flash_checkWaitForPlay(); + } + }, + _flash_playHead: function(p) { + try { + this._getMovie().fl_play_head(p); + } catch(err) { this._flashError(err); } + if(!this.status.waitForLoad) { + this._flash_checkWaitForPlay(); + } + }, + _flash_checkWaitForPlay: function() { + if(this.status.waitForPlay) { + this.status.waitForPlay = false; + if(this.css.jq.videoPlay.length) { + this.css.jq.videoPlay.hide(); + } + if(this.status.video) { + this.internal.poster.jq.hide(); + this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height}); + } + } + }, + _flash_volume: function(v) { + try { + this._getMovie().fl_volume(v); + } catch(err) { this._flashError(err); } + }, + _flash_mute: function(m) { + try { + this._getMovie().fl_mute(m); + } catch(err) { this._flashError(err); } + }, + _getMovie: function() { + return document[this.internal.flash.id]; + }, + _checkForFlash: function (version) { + // Function checkForFlash adapted from FlashReplace by Robert Nyman + // http://code.google.com/p/flashreplace/ + var flashIsInstalled = false; + var flash; + if(window.ActiveXObject){ + try{ + flash = new ActiveXObject(("ShockwaveFlash.ShockwaveFlash." + version)); + flashIsInstalled = true; + } + catch(e){ + // Throws an error if the version isn't available + } + } + else if(navigator.plugins && navigator.mimeTypes.length > 0){ + flash = navigator.plugins["Shockwave Flash"]; + if(flash){ + var flashVersion = navigator.plugins["Shockwave Flash"].description.replace(/.*\s(\d+\.\d+).*/, "$1"); + if(flashVersion >= version){ + flashIsInstalled = true; + } + } + } + return flashIsInstalled; + }, + _validString: function(url) { + return (url && typeof url === "string"); // Empty strings return false + }, + _limitValue: function(value, min, max) { + return (value < min) ? min : ((value > max) ? max : value); + }, + _urlNotSetError: function(context) { + this._error( { + type: $.jPlayer.error.URL_NOT_SET, + context: context, + message: $.jPlayer.errorMsg.URL_NOT_SET, + hint: $.jPlayer.errorHint.URL_NOT_SET + }); + }, + _flashError: function(error) { + var errorType; + if(!this.internal.ready) { + errorType = "FLASH"; + } else { + errorType = "FLASH_DISABLED"; + } + this._error( { + type: $.jPlayer.error[errorType], + context: this.internal.flash.swf, + message: $.jPlayer.errorMsg[errorType] + error.message, + hint: $.jPlayer.errorHint[errorType] + }); + // Allow the audio player to recover if display:none and then shown again, or with position:fixed on Firefox. + // This really only affects audio in a media player, as an audio player could easily move the jPlayer element away from such issues. + this.internal.flash.jq.css({'width':'1px', 'height':'1px'}); + }, + _error: function(error) { + this._trigger($.jPlayer.event.error, error); + if(this.options.errorAlerts) { + this._alert("Error!" + (error.message ? "\n\n" + error.message : "") + (error.hint ? "\n\n" + error.hint : "") + "\n\nContext: " + error.context); + } + }, + _warning: function(warning) { + this._trigger($.jPlayer.event.warning, undefined, warning); + if(this.options.warningAlerts) { + this._alert("Warning!" + (warning.message ? "\n\n" + warning.message : "") + (warning.hint ? "\n\n" + warning.hint : "") + "\n\nContext: " + warning.context); + } + }, + _alert: function(message) { + alert("jPlayer " + this.version.script + " : id='" + this.internal.self.id +"' : " + message); + }, + _emulateHtmlBridge: function() { + var self = this, + methods = $.jPlayer.emulateMethods; + + // Emulate methods on jPlayer's DOM element. + $.each( $.jPlayer.emulateMethods.split(/\s+/g), function(i, name) { + self.internal.domNode[name] = function(arg) { + self[name](arg); + }; + + }); + + // Bubble jPlayer events to its DOM element. + $.each($.jPlayer.event, function(eventName,eventType) { + var nativeEvent = true; + $.each( $.jPlayer.reservedEvent.split(/\s+/g), function(i, name) { + if(name === eventName) { + nativeEvent = false; + return false; + } + }); + if(nativeEvent) { + self.element.bind(eventType + ".jPlayer.jPlayerHtml", function() { // With .jPlayer & .jPlayerHtml namespaces. + self._emulateHtmlUpdate(); + var domEvent = document.createEvent("Event"); + domEvent.initEvent(eventName, false, true); + self.internal.domNode.dispatchEvent(domEvent); + }); + } + // The error event would require a special case + }); + + // IE9 has a readyState property on all elements. The document should have it, but all (except media) elements inherit it in IE9. This conflicts with Popcorn, which polls the readyState. + }, + _emulateHtmlUpdate: function() { + var self = this; + + $.each( $.jPlayer.emulateStatus.split(/\s+/g), function(i, name) { + self.internal.domNode[name] = self.status[name]; + }); + $.each( $.jPlayer.emulateOptions.split(/\s+/g), function(i, name) { + self.internal.domNode[name] = self.options[name]; + }); + }, + _destroyHtmlBridge: function() { + var self = this; + + // Bridge event handlers are also removed by destroy() through .jPlayer namespace. + this.element.unbind(".jPlayerHtml"); // Remove all event handlers created by the jPlayer bridge. So you can change the emulateHtml option. + + // Remove the methods and properties + var emulated = $.jPlayer.emulateMethods + " " + $.jPlayer.emulateStatus + " " + $.jPlayer.emulateOptions; + $.each( emulated.split(/\s+/g), function(i, name) { + delete self.internal.domNode[name]; + }); + } + }; + + $.jPlayer.error = { + FLASH: "e_flash", + FLASH_DISABLED: "e_flash_disabled", + NO_SOLUTION: "e_no_solution", + NO_SUPPORT: "e_no_support", + URL: "e_url", + URL_NOT_SET: "e_url_not_set", + VERSION: "e_version" + }; + + $.jPlayer.errorMsg = { + FLASH: "jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ", // Used in: _flashError() + FLASH_DISABLED: "jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ", // Used in: _flashError() + NO_SOLUTION: "No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.", // Used in: _init() + NO_SUPPORT: "It is not possible to play any media format provided in setMedia() on this browser using your current options.", // Used in: setMedia() + URL: "Media URL could not be loaded.", // Used in: jPlayerFlashEvent() and _addHtmlEventListeners() + URL_NOT_SET: "Attempt to issue media playback commands, while no media url is set.", // Used in: load(), play(), pause(), stop() and playHead() + VERSION: "jPlayer " + $.jPlayer.prototype.version.script + " needs Jplayer.swf version " + $.jPlayer.prototype.version.needFlash + " but found " // Used in: jPlayerReady() + }; + + $.jPlayer.errorHint = { + FLASH: "Check your swfPath option and that Jplayer.swf is there.", + FLASH_DISABLED: "Check that you have not display:none; the jPlayer entity or any ancestor.", + NO_SOLUTION: "Review the jPlayer options: support and supplied.", + NO_SUPPORT: "Video or audio formats defined in the supplied option are missing.", + URL: "Check media URL is valid.", + URL_NOT_SET: "Use setMedia() to set the media URL.", + VERSION: "Update jPlayer files." + }; + + $.jPlayer.warning = { + CSS_SELECTOR_COUNT: "e_css_selector_count", + CSS_SELECTOR_METHOD: "e_css_selector_method", + CSS_SELECTOR_STRING: "e_css_selector_string", + OPTION_KEY: "e_option_key" + }; + + $.jPlayer.warningMsg = { + CSS_SELECTOR_COUNT: "The number of css selectors found did not equal one: ", + CSS_SELECTOR_METHOD: "The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.", + CSS_SELECTOR_STRING: "The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.", + OPTION_KEY: "The option requested in jPlayer('option') is undefined." + }; + + $.jPlayer.warningHint = { + CSS_SELECTOR_COUNT: "Check your css selector and the ancestor.", + CSS_SELECTOR_METHOD: "Check your method name.", + CSS_SELECTOR_STRING: "Check your css selector is a string.", + OPTION_KEY: "Check your option name." + }; +})(jQuery); From 1415cb8d196761b4f3b0ecb567aa2377fb417840 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 1 Jan 2012 23:45:22 +0100 Subject: [PATCH 08/11] add infieldlabel source --- core/js/jquery.infieldlabel.js | 140 +++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100755 core/js/jquery.infieldlabel.js diff --git a/core/js/jquery.infieldlabel.js b/core/js/jquery.infieldlabel.js new file mode 100755 index 0000000000..f6a67b66ce --- /dev/null +++ b/core/js/jquery.infieldlabel.js @@ -0,0 +1,140 @@ +/* + * In-Field Label jQuery Plugin + * http://fuelyourcoding.com/scripts/infield.html + * + * Copyright (c) 2009 Doug Neiner + * Dual licensed under the MIT and GPL licenses. + * Uses the same license as jQuery, see: + * http://docs.jquery.com/License + * + * @version 0.1 + */ +(function($){ + + $.InFieldLabels = function(label,field, options){ + // To avoid scope issues, use 'base' instead of 'this' + // to reference this class from internal events and functions. + var base = this; + + // Access to jQuery and DOM versions of each element + base.$label = $(label); + base.label = label; + + base.$field = $(field); + base.field = field; + + base.$label.data("InFieldLabels", base); + base.showing = true; + + base.init = function(){ + // Merge supplied options with default options + base.options = $.extend({},$.InFieldLabels.defaultOptions, options); + + // Check if the field is already filled in + if(base.$field.val() != ""){ + base.$label.hide(); + base.showing = false; + }; + + base.$field.focus(function(){ + base.fadeOnFocus(); + }).blur(function(){ + base.checkForEmpty(true); + }).bind('keydown.infieldlabel',function(e){ + // Use of a namespace (.infieldlabel) allows us to + // unbind just this method later + base.hideOnChange(e); + }).change(function(e){ + base.checkForEmpty(); + }).bind('onPropertyChange', function(){ + base.checkForEmpty(); + }); + }; + + // If the label is currently showing + // then fade it down to the amount + // specified in the settings + base.fadeOnFocus = function(){ + if(base.showing){ + base.setOpacity(base.options.fadeOpacity); + }; + }; + + base.setOpacity = function(opacity){ + base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration); + base.showing = (opacity > 0.0); + }; + + // Checks for empty as a fail safe + // set blur to true when passing from + // the blur event + base.checkForEmpty = function(blur){ + if(base.$field.val() == ""){ + base.prepForShow(); + base.setOpacity( blur ? 1.0 : base.options.fadeOpacity ); + } else { + base.setOpacity(0.0); + }; + }; + + base.prepForShow = function(e){ + if(!base.showing) { + // Prepare for a animate in... + base.$label.css({opacity: 0.0}).show(); + + // Reattach the keydown event + base.$field.bind('keydown.infieldlabel',function(e){ + base.hideOnChange(e); + }); + }; + }; + + base.hideOnChange = function(e){ + if( + (e.keyCode == 16) || // Skip Shift + (e.keyCode == 9) // Skip Tab + ) return; + + if(base.showing){ + base.$label.hide(); + base.showing = false; + }; + + // Remove keydown event to save on CPU processing + base.$field.unbind('keydown.infieldlabel'); + }; + + // Run the initialization method + base.init(); + }; + + $.InFieldLabels.defaultOptions = { + fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be + fadeDuration: 300 // How long should it take to animate from 1.0 opacity to the fadeOpacity + }; + + + $.fn.inFieldLabels = function(options){ + return this.each(function(){ + // Find input or textarea based on for= attribute + // The for attribute on the label must contain the ID + // of the input or textarea element + var for_attr = $(this).attr('for'); + if( !for_attr ) return; // Nothing to attach, since the for field wasn't used + + + // Find the referenced input or textarea element + var $field = $( + "input#" + for_attr + "[type='text']," + + "input#" + for_attr + "[type='password']," + + "textarea#" + for_attr + ); + + if( $field.length == 0) return; // Again, nothing to attach + + // Only create object for input[text], input[password], or textarea + (new $.InFieldLabels(this, $field[0], options)); + }); + }; + +})(jQuery); \ No newline at end of file From a9bab168f5e43bfa5fe1523aab80faf1bc02cd58 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 18:40:32 -0500 Subject: [PATCH 09/11] Replace canRead()/canWrite() with is_readable()/is_writeable() for proper permission checks --- lib/filestorage/local.php | 4 +-- lib/filesystem.php | 61 +++++++++++++++------------------------ 2 files changed, 25 insertions(+), 40 deletions(-) diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 9e29f85071..02746fa6c6 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -50,10 +50,10 @@ class OC_Filestorage_Local extends OC_Filestorage{ } } public function is_readable($path){ - return is_readable($this->datadir.$path); + return true; } public function is_writeable($path){ - return is_writeable($this->datadir.$path); + return true; } public function file_exists($path){ return file_exists($this->datadir.$path); diff --git a/lib/filesystem.php b/lib/filesystem.php index cae8ead5b1..9b3dde1ae0 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -130,35 +130,6 @@ class OC_Filesystem{ return $internalPath; } - /** - * check if the current users has the right premissions to read a file - * @param string path - * @return bool - */ - static private function canRead($path){ - if(substr($path,0,1)!=='/'){ - $path='/'.$path; - } - if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){ - return false; - } - return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there - } - /** - * check if the current users has the right premissions to write a file - * @param string path - * @return bool - */ - static private function canWrite($path){ - if(substr($path,0,1)!=='/'){ - $path='/'.$path; - } - if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){ - return false; - } - return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there - } - /** * mount an OC_Filestorage in our virtual filesystem * @param OC_Filestorage storage @@ -228,7 +199,7 @@ class OC_Filesystem{ */ static public function getLocalFile($path){ $parent=substr($path,0,strrpos($path,'/')); - if(self::canRead($parent) and $storage=self::getStorage($path)){ + if(self::is_readable($parent) and $storage=self::getStorage($path)){ return $storage->getLocalFile(self::getInternalPath($path)); } } @@ -267,10 +238,24 @@ class OC_Filesystem{ return self::basicOperation('readfile',$path,array('read')); } static public function is_readable($path){ - return self::basicOperation('is_readable',$path); + if(substr($path,0,1)!=='/'){ + $path='/'.$path; + } + if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){ + return false; + } + $storage=self::getStorage($path); + return $storage->is_readable($path); } static public function is_writeable($path){ - return self::basicOperation('is_writeable',$path); + if(substr($path,0,1)!=='/'){ + $path='/'.$path; + } + if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){ + return false; + } + $storage=self::getStorage($path); + return $storage->is_writeable($path); } static public function file_exists($path){ if($path=='/'){ @@ -297,7 +282,7 @@ class OC_Filesystem{ return self::basicOperation('unlink',$path,array('delete')); } static public function rename($path1,$path2){ - if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::canWrite($path1) and self::canWrite($path2)){ + if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::is_writeable($path2)){ $run=true; OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run)); if($run){ @@ -318,7 +303,7 @@ class OC_Filesystem{ } } static public function copy($path1,$path2){ - if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::canRead($path1) and self::canWrite($path2)){ + if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::is_writeable($path2)){ $run=true; OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run)); $exists=self::file_exists($path2); @@ -373,13 +358,13 @@ class OC_Filesystem{ return self::basicOperation('fopen',$path,$hooks,$mode); } static public function toTmpFile($path){ - if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::canRead($path) and $storage=self::getStorage($path)){ + if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::is_readable($path) and $storage=self::getStorage($path)){ OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path)); return $storage->toTmpFile(self::getInternalPath($path)); } } static public function fromTmpFile($tmpFile,$path){ - if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){ + if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::is_writeable($path) and $storage=self::getStorage($path)){ $run=true; $exists=self::file_exists($path); if(!$exists){ @@ -399,7 +384,7 @@ class OC_Filesystem{ } } static public function fromUploadedFile($tmpFile,$path){ - if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){ + if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::is_writeable($path) and $storage=self::getStorage($path)){ $run=true; $exists=self::file_exists($path); if(!$exists){ @@ -462,7 +447,7 @@ class OC_Filesystem{ * @return mixed */ private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){ - if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::canRead($path) and $storage=self::getStorage($path)){ + if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::is_readable($path) and $storage=self::getStorage($path)){ $interalPath=self::getInternalPath($path); $run=true; foreach($hooks as $hook){ From 470bab9c682fdbe4dcb331f2f6a00b3a9aefc929 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 18:45:26 -0500 Subject: [PATCH 10/11] Fix typo in move error message --- files/ajax/move.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/ajax/move.php b/files/ajax/move.php index 8a56a01548..3517901c6c 100644 --- a/files/ajax/move.php +++ b/files/ajax/move.php @@ -14,7 +14,7 @@ $target = $_GET["target"]; if(OC_Files::move($dir,$file,$target,$file)){ OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); }else{ - OC_JSON::error(array("data" => array( "message" => "Could move $file" ))); + OC_JSON::error(array("data" => array( "message" => "Could not move $file" ))); } ?> From 4374d55e5e020a1f2673a18991be6f2560e9f2c3 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 1 Jan 2012 19:59:24 -0500 Subject: [PATCH 11/11] Correct local permissions checks --- lib/filestorage/local.php | 4 ++-- lib/filesystem.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 02746fa6c6..cfc2715978 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -50,10 +50,10 @@ class OC_Filestorage_Local extends OC_Filestorage{ } } public function is_readable($path){ - return true; + return is_readable($this->datadir.$path); } public function is_writeable($path){ - return true; + return is_writable($this->datadir.$path); } public function file_exists($path){ return file_exists($this->datadir.$path); diff --git a/lib/filesystem.php b/lib/filesystem.php index 9b3dde1ae0..1205a6aa51 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -245,7 +245,7 @@ class OC_Filesystem{ return false; } $storage=self::getStorage($path); - return $storage->is_readable($path); + return $storage->is_readable(self::getInternalPath($path)); } static public function is_writeable($path){ if(substr($path,0,1)!=='/'){ @@ -255,7 +255,7 @@ class OC_Filesystem{ return false; } $storage=self::getStorage($path); - return $storage->is_writeable($path); + return $storage->is_writeable(self::getInternalPath($path)); } static public function file_exists($path){ if($path=='/'){