Changeset 920
- Timestamp:
- 04/07/10 16:14:03 (3 years ago)
- Location:
- trunk/html5
- Files:
-
- 44 added
- 1 edited
- 5 moved
-
ant.properties (added)
-
build.xml (added)
-
build/jquery.jwplayer-0.1alpha.js (added)
-
build/jquery.jwplayer-0.1alpha.min.js (added)
-
index.html (modified) (1 diff)
-
lib (moved) (moved from trunk/html5/libs)
-
lib/yuicompressor-2.4.2 (added)
-
lib/yuicompressor-2.4.2/ant.properties (added)
-
lib/yuicompressor-2.4.2/build (added)
-
lib/yuicompressor-2.4.2/build.xml (added)
-
lib/yuicompressor-2.4.2/build/yuicompressor-2.4.2.jar (added)
-
lib/yuicompressor-2.4.2/doc (added)
-
lib/yuicompressor-2.4.2/doc/CHANGELOG (added)
-
lib/yuicompressor-2.4.2/doc/README (added)
-
lib/yuicompressor-2.4.2/lib (added)
-
lib/yuicompressor-2.4.2/lib/jargs-1.0.jar (added)
-
lib/yuicompressor-2.4.2/lib/rhino-1.6R7.jar (added)
-
lib/yuicompressor-2.4.2/src (added)
-
lib/yuicompressor-2.4.2/src/com (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/Bootstrap.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/CssCompressor.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/JarClassLoader.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/JavaScriptCompressor.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/JavaScriptIdentifier.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/JavaScriptToken.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/ScriptOrFnScope.java (added)
-
lib/yuicompressor-2.4.2/src/com/yahoo/platform/yui/compressor/YUICompressor.java (added)
-
lib/yuicompressor-2.4.2/src/org (added)
-
lib/yuicompressor-2.4.2/src/org/mozilla (added)
-
lib/yuicompressor-2.4.2/src/org/mozilla/javascript (added)
-
lib/yuicompressor-2.4.2/src/org/mozilla/javascript/Decompiler.java (added)
-
lib/yuicompressor-2.4.2/src/org/mozilla/javascript/Parser.java (added)
-
lib/yuicompressor-2.4.2/src/org/mozilla/javascript/Token.java (added)
-
lib/yuicompressor-2.4.2/src/org/mozilla/javascript/TokenStream.java (added)
-
src/jquery.jwplayerControlbar.js (moved) (moved from trunk/html5/src/jquery.jwplayer.controlbar.js)
-
src/jquery.jwplayerController.js (added)
-
src/jquery.jwplayerCore.js (moved) (moved from trunk/html5/src/jquery.jwplayer.core.js) (1 diff)
-
src/jquery.jwplayerModel.js (added)
-
src/jquery.jwplayerSkinner.js (moved) (moved from trunk/html5/src/jquery.jwplayer.skinner.js)
-
src/jquery.jwplayerUtils.js (moved) (moved from trunk/html5/src/jquery.jwplayer.utils.js) (5 diffs)
-
src/jquery.jwplayerUtilsParsers.js (added)
-
src/jquery.jwplayerUtilsParsersDOMElementParser.js (added)
-
src/jquery.jwplayerUtilsParsersDOMMediaElementParser.js (added)
-
src/jquery.jwplayerUtilsParsersDOMSourceElementParser.js (added)
-
src/jquery.jwplayerUtilsParsersDOMVideoElementParser.js (added)
-
src/jquery.jwplayerView.js (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/html5/index.html
r918 r920 12 12 </style> 13 13 14 <script type="text/javascript" src="libs/jquery.js"></script> 15 <script type="text/javascript" src="src/jquery.jwplayer.core.js"></script> 16 <script type="text/javascript" src="src/jquery.jwplayer.utils.js"></script> 14 <script type="text/javascript" src="lib/jquery.js"></script> 15 <script type="text/javascript" src="build/jquery.jwplayer-0.1alpha.js"></script> 17 16 18 17 </head> -
trunk/html5/src/jquery.jwplayerCore.js
r918 r920 13 13 $.fn.jwplayer = function(options) { 14 14 return this.each(function() { 15 var config = $.extend({},$.fn.jwplayer.defaults,options); 16 if ($.fn.jwplayer.utils.supportsFlash){ 17 $.fn.jwplayer.utils.embedFlash(this, config); 15 var domConfig = $.fn.jwplayerUtilsParsersDOMElementParser.parse(this); 16 var model = $.extend(true, {}, $.fn.jwplayer.defaults, options, domConfig); 17 if ($.fn.jwplayerUtils.supportsFlash){ 18 $.fn.jwplayerView.embedFlash(this, model); 18 19 } 19 20 // loadSkin(options); 20 21 }); 21 }; 22 22 } 23 23 24 24 /** Map with all players on the page. **/ -
trunk/html5/src/jquery.jwplayerUtils.js
r918 r920 9 9 (function($){ 10 10 11 $.fn.jwplayer .utils = function(ops){11 $.fn.jwplayerUtils = function(){ 12 12 return this.each(function() { 13 13 }); 14 } ;14 } 15 15 16 16 /** Check if this client supports Flash player 9.0.115+ (FLV/H264). **/ 17 $.fn.jwplayer .utils.supportsFlash = function() {17 $.fn.jwplayerUtils.supportsFlash = function() { 18 18 var version = '0,0,0,0'; 19 19 try { … … 42 42 43 43 /** check if this client supports HTML5 H.264 playback. **/ 44 $.fn.jwplayer .utils.supportsH264 = function() {44 $.fn.jwplayerUtils.supportsH264 = function() { 45 45 try { 46 46 return !!document.createElement('video').canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"'); … … 52 52 53 53 /** check if this client supports HTML5 OGG playback. **/ 54 $.fn.jwplayer .utils.supportsOgg = function() {54 $.fn.jwplayerUtils.supportsOgg = function() { 55 55 try { 56 56 return !!document.createElement('video').canPlayType('video/ogg; codecs="theora, vorbis"'); … … 62 62 63 63 /** Embeds a Flash Player at the specified location in the DOM. **/ 64 $.fn.jwplayer .utils.embedFlash = function(object, options) {64 $.fn.jwplayerUtils.embedFlash = function(object, options) { 65 65 object = $(object); 66 66 var flashvars = ""; … … 95 95 }; 96 96 97 $.fn.jwplayerUtils.dump = function(object, depth) { 98 if (object == null) { 99 return 'null'; 100 } else if ($.fn.jwplayerUtils.typeOf(object) != 'object') { 101 if ($.fn.jwplayerUtils.typeOf(object) == 'string'){ 102 return"\""+object+"\""; 103 } 104 return object; 105 } 106 107 var type = $.fn.jwplayerUtils.typeOf(object); 108 109 (depth == undefined) ? depth = 1 : depth++; 110 var indent = ""; 111 for (var i = 0; i < depth; i++) { indent += "\t"; } 112 113 var result = (type == "array") ? "[" : "{"; 114 result += "\n"+indent; 115 116 for (var i in object) { 117 if (type == "object") { result += "\""+i+"\": "}; 118 result += $.fn.jwplayerUtils.dump(object[i], depth)+",\n"+indent; 119 } 120 121 result = result.substring(0, result.length-2-depth)+"\n"; 122 123 result += indent.substring(0, indent.length-1); 124 result += (type == "array") ? "]" : "}"; 125 126 return result; 127 } 128 129 $.fn.jwplayerUtils.typeOf = function(value) { 130 var s = typeof value; 131 if (s === 'object') { 132 if (value) { 133 if (value instanceof Array) { 134 s = 'array'; 135 } 136 } else { 137 s = 'null'; 138 } 139 } 140 return s; 141 } 142 97 143 98 144 })(jQuery);
Note: See TracChangeset
for help on using the changeset viewer.
