Permalink
Browse files

1.3.4RC

  • Loading branch information...
1 parent a97e627 commit 2e54ea3b40f4b82867076c3f5814d8df9f73ea92 @aFarkas committed Nov 20, 2010
View
@@ -2,7 +2,7 @@
<property description="Folder for all jMediaelement packages and min target" name="dist" value="./packages" />
- <property name="version" value="1.3.3" />
+ <property name="version" value="1.3.4RC" />
<property name="mediafull" value="${dist}/mm.full.js" />
<property name="mediafullmin" value="${dist}/mm.full.min.js" />
View
@@ -27,7 +27,7 @@
background: #000;
}
</style>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- jmeEmbed - plugin -->
<!-- configure path to swf-fallback: script.jwPlayer[src] -->
View
@@ -6,10 +6,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/themes/blitzer/jquery-ui.css"/>
<link rel="stylesheet" href="css/styles.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
</head>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/redmond/jquery-ui.css"/>
<link rel="stylesheet" href="css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components: you only need slider + progressbar -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../utils/a11y-slider.ext.js"></script>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/vader/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../../utils/a11y-slider.ext.js"></script>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/sunny/jquery-ui.css"/>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js">
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js">
</script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.js">
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.js">
</script>
<!-- END: ui-components -->
@@ -37,7 +37,7 @@
background-color: #99e;
}
</style>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- full jme script -->
@@ -75,9 +75,9 @@
background-color: #99e;
}
</style>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- full jme script -->
<!-- configure path to swf-fallback: script.jwPlayer[src] -->
@@ -27,10 +27,10 @@
</style>
<!-- jQuery -->
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- for a11y-slider -->
@@ -27,10 +27,10 @@
</style>
<!-- jQuery -->
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- for a11y-slider -->
@@ -6,13 +6,13 @@
<link rel="stylesheet" href="../css/styles.css" />
- <link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/themes/vader/jquery-ui.css"/>
+ <link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/themes/vader/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for WAI-Aria-enhanced UI Slider -->
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/vader/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-style-dts.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../../utils/a11y-slider.ext.js"></script>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/sunny/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../../utils/a11y-slider.ext.js"></script>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/sunny/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js">
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js">
</script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.js">
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.js">
</script>
<!-- END: ui-components --><!-- optional for a11y-slider -->
<script src="../../utils/a11y-slider.ext.js">
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/redmond/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- for a11y-slider -->
@@ -5,7 +5,7 @@
<title>embed only Demo</title>
<link rel="stylesheet" href="../css/styles.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- jmeEmbed script -->
<!-- configure path to swf-fallback: script.jwPlayer[src] -->
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/redmond/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../../utils/a11y-slider.ext.js"></script>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/redmond/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../../utils/a11y-slider.ext.js"></script>
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/redmond/jquery-ui.css"/>
<link rel="stylesheet" href="../css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- for a11y-slider -->
@@ -8,10 +8,10 @@
<link class="ui-theme" rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/themes/redmond/jquery-ui.css"/>
<link rel="stylesheet" href="css/player-controls.css" />
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<!-- ui-components: you only need slider + progressbar -->
- <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js"></script>
<!-- END: ui-components -->
<!-- optional for a11y-slider -->
<script src="../utils/a11y-slider.ext.js"></script>
View
@@ -1,5 +1,5 @@
/**!
- * Part of the jMediaelement-Project v1.3.3 | http://github.com/aFarkas/jMediaelement
+ * Part of the jMediaelement-Project v1.3.4RC | http://github.com/aFarkas/jMediaelement
* @author Alexander Farkas
* Copyright 2010, Alexander Farkas
* Dual licensed under the MIT or GPL Version 2 licenses.
@@ -54,40 +54,6 @@
var cssShow = { left: "0px", position: "absolute", visibility: "hidden", display:"block" },
- getHiddenDim = function(jElm, ancestorFrom){
- var parent = ancestorFrom.parentNode,
- body = document.body,
- ret = {width: 0, height: 0}
- ;
- while(parent && parent !== body){
- if( $.curCSS(parent, 'display') === 'none' ){
- $.swap( parent, cssShow, function(){
- var styles = false;
- // if !important is used
- if( $.curCSS(parent, 'display', true) === 'none' ){
- //for IE6/7 we need to remove inline-style first
- parent.style.display = '';
- styles = $.attr(parent, 'style');
- $.attr(parent, 'style', styles+'; display: block !important;');
- }
- ret.height = jElm.innerHeight();
- ret.width = jElm.innerWidth();
- if( !ret.width && !ret.height ){
- ret = getHiddenDim(jElm, parent);
- }
- if( styles !== false ){
- $.attr(parent, 'style', styles);
- }
- } );
- if( ret.width || ret.height ){
- break;
- }
- }
-
- parent = parent.parentNode;
- }
- return ret;
- },
dimStyles = ['float']
;
@@ -108,20 +74,12 @@
;
// assume that inline style is correct
// enables %, em etc. feature with inline-style (i.e.: 100%)
- ret.height = elmS.height;
- ret.width = elmS.width;
+ ret.height = elmS.height || this.innerHeight();
+ ret.width = elmS.width || this.innerWidth();
$.each(dimStyles, function(i, name){
// assume that inline style is correct
ret[name] = elmS[name] || elem.css(name);
});
- if( !ret.width || !ret.height || ret.height == 'auto' || ret.width == 'auto' ){
- ret.height = this.innerHeight();
- ret.width = this.innerWidth();
-
- if( !ret.width && !ret.height ){
- ret = getHiddenDim(this, this[0]);
- }
- }
}
return ret;
};
@@ -1186,7 +1144,7 @@
return ret;
},
canPlayCodecs: ['avc1.42E01E', 'mp4a.40.2', 'avc1.58A01E', 'avc1.4D401E', 'avc1.64001E', 'VP6', 'mp3', 'AAC'],
- canPlayContainer: ['video/3gpp', 'video/x-msvideo', 'video/quicktime', 'video/x-m4v', 'video/mp4', 'video/m4p', 'video/x-flv', 'video/flv', 'audio/mpeg', 'audio/mp3', 'audio/x-fla', 'audio/fla', 'youtube/flv', 'jwplayer/jwplayer']
+ canPlayContainer: ['video/3gpp', 'video/x-msvideo', 'video/quicktime', 'video/x-m4v', 'video/mp4', 'video/m4p', 'video/x-flv', 'video/flv', 'audio/mpeg', 'audio/mp3', 'audio/m4a', 'audio/mp4', 'audio/x-fla', 'audio/fla', 'audio/x-m4a', 'youtube/flv', 'jwplayer/jwplayer']
}
;
Oops, something went wrong.

0 comments on commit 2e54ea3

Please sign in to comment.