Changeset 2167

Timestamp:

04/16/12 07:10:24 (13 months ago)

Author:

pablo

Message:

Branch for v6 dev work

Location:

branches/jw6

Files:

• .actionScriptProperties (modified) (1 diff)
• .externalToolBuilders/Ant Builder.launch (modified) (1 diff)
• .project (modified) (2 diffs)
• bin-debug/jwplayer (PabloBook's conflicted copy 2012-04-11).js (deleted)
• bin-debug/jwplayer.js (modified) (3 diffs)
• jwplayer.min.js (added)
• jwplayer.min.js_before (added)
• src (added)
• src/HTML5Refactor.as (added)
• src/js (added)
• src/js/api (added)
• src/js/embed (added)
• src/js/html5 (added)
• src/js/html5/jwplayer.html5.controlbar.js (added)
• src/js/html5/jwplayer.html5.defaultskin.js (added)
• src/js/html5/jwplayer.html5.js (added)
• src/js/html5/jwplayer.html5.skin.js (added)
• src/js/html5/jwplayer.html5.skinloader.js (added)
• src/js/html5/jwplayer.html5.video.js (added)
• src/js/html5/utils (added)
• src/js/html5/utils/jwplayer.html5.utils.animations.js (added)
• src/js/html5/utils/jwplayer.html5.utils.js (added)
• src/js/jwplayer.js (added)
• src/js/jwplayer.sourceend.js (added)
• src/js/jwplayer.sourcestart.js (added)
• src/js/utils (added)
• src/js/utils/jwplayer.utils.ajax.js (added)
• src/js/utils/jwplayer.utils.js (added)
• src/js/utils/jwplayer.utils.strings.js (added)
• src/js/utils/jwplayer.utils.typechecker.js (added)
• test (added)
• test/animations.html (added)
• test/controlbar.html (added)
• test/controlbarLayout.html (added)
• test/index.html (added)

branches/jw6/.actionScriptProperties

@@ -34 +34 @@
   <buildCSSFiles/>
 </actionScriptProperties>
+

branches/jw6/.externalToolBuilders/Ant Builder.launch

@@ -3 +3 @@
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1334571635362_21&quot; label=&quot;workingSet&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/jw6/build&quot; type=&quot;2&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/jw6/src&quot; type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/ant"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/HTML5Refactor}/build/"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}/build/"/>
 </launchConfiguration>

branches/jw6/.project

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <projectDescription>
-        <name>HTML5Refactor</name>
-        <comment></comment>
+        <name>jw6</name>
+        <comment/>
         <projects>
         </projects>
@@ -30 +30 @@
         </natures>
 </projectDescription>
+

branches/jw6/bin-debug/jwplayer.js

@@ -111 +111 @@
         };
         
+        utils.cssStyle = function(selector, styles) {
+                if (!_styleSheet) {
+                        _styleSheet = document.createElement("style");
+                        _styleSheet.type = "text/css";
+                        document.getElementsByTagName('head')[0].appendChild(_styleSheet);
+                }
+
+                if (_rules[selector]) {
+                        for (var s in styles) {
+                                _rules[selector][s] = styles[s];
+                        }
+                        styles = _rules[selector];
+                }
+                
+                _rules[selector] = styles;
+        }
+        
         function _updateStylesheet() {
                 if (_styleSheet) {
                         var ruleText = "";
                         for (var rule in _rules) {
-                                ruleText += rule + "{" + _rules[rule].cssText + "}\n";
+                                var styles = _rules[rule];
+                                ruleText += rule + "{";
+                                for (var style in styles) {
+                                        ruleText += style + ": " + styles[style] + ";\n";
+                                }
+                                ruleText += "}\n";
                         }
                         _styleSheet.innerHTML = ruleText;
@@ -960 +982 @@
                 
                 var _setBuffer = this.setBuffer = function(pct) {
+                        pct = Math.min(Math.max(0, pct), 1);
                         _elements['timeSliderBuffer'].style.width = 100 * pct + "%";
                 }
@@ -1079 +1102 @@
                 //OTransition: 'left .5s linear 0s, opacity .5s ease .5s' -- this produces console errors in Opera
             });             
-            _css(CB_CLASS + ' .timeSliderProgress', {
+            _css(CB_CLASS + ' .timeSliderProgress,' + CB_CLASS + ' .timeSliderBuffer', {
                 webkitTransition: 'width .5s linear',
                 MozTransition: 'width .5s linear',