Skip to content

Commit

Permalink
1.14.3
Browse files Browse the repository at this point in the history
  • Loading branch information
aFarkas committed Jun 28, 2014
1 parent ca3b1d0 commit 689fc81
Show file tree
Hide file tree
Showing 32 changed files with 139 additions and 56 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "webshim",
"version": "1.14.3-RC3",
"version": "1.14.3",
"homepage": "https://github.com/aFarkas/webshim",
"authors": [
"aFarkas <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
upcomming Release 1.14.3
Release 1.14.3
----------
- added new language files (zh-TW and fa)
- removed box-shadows and border-radius and added new metro theme ([demo](http://afarkas.github.io/webshim/demos/demos/themes/themes.html))
Expand Down
2 changes: 1 addition & 1 deletion demos/demos/forms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<div id="sidebar" class="interface">

<a class="toc_title" href="../index.html"> Webshim <span class="version">(<span class="ws-version">1.14.3-RC3</span>)</span></a>
<a class="toc_title" href="../index.html"> Webshim <span class="version">(<span class="ws-version">1.14.3</span>)</span></a>
<ul class="toc_section">
<li>
&raquo; <a href="https://github.com/aFarkas/webshim">GitHub Repository</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demos/mediaelement.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

<div id="sidebar" class="interface">

<a class="toc_title" href="../index.html"> Webshim <span class="version">(<span class="ws-version">1.14.3-RC3</span>)</span></a>
<a class="toc_title" href="../index.html"> Webshim <span class="version">(<span class="ws-version">1.14.3</span>)</span></a>
<ul class="toc_section">
<li>
&raquo; <a href="https://github.com/aFarkas/webshim">GitHub Repository</a>
Expand Down
2 changes: 1 addition & 1 deletion demos/demos/mediaelement/playlist.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"title": "Caminandes: Gran Dillama",
"srces": [
{"src": "http://corrupt-system.de/assets/media/caminandes/caminandes.mp4", "type": "video/mp4"},
{"src": "http://corrupt-system.de/assets/media/caminandes/caminandes.m4v", "type": "video/mp4"},
"http://corrupt-system.de/assets/media/caminandes/caminandes.webm"
],
"poster": "http://corrupt-system.de/assets/media/caminandes/caminandes.jpg"
Expand Down
3 changes: 2 additions & 1 deletion demos/demos/mediaelement/responsive-mediaelement.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
<script src="../../../js-webshim/minified/polyfiller.js"></script>

<script>
webshim.setOptions('debug', 'noCombo')
webshim.setOptions('track', {override: 'auto'});
webshim.setOptions('mediaelement', {replaceUI: 'auto'});
webshim.polyfill('mediaelement');
Expand Down Expand Up @@ -168,7 +169,7 @@ <h2>intrinsic ratio responsive/fluid video</h2>

<div class="mediaplayer videoplayer ratio-16-9">
<video controls preload="none" poster="http://corrupt-system.de/assets/media/caminandes/caminandes.jpg" style="height: 100%;">
<source src="http://corrupt-system.de/assets/media/caminandes/caminandes.mp4" type="video/mp4" />
<source src="http://corrupt-system.de/assets/media/caminandes/caminandes.m4v" type="video/mp4" />
<source src="http://corrupt-system.de/assets/media/caminandes/caminandes.webm" type="video/webm" />

<p>You need a modern Browser or install the Flash Plugin or simply download the video (<a href="http://corrupt-system.de/assets/media/sintel/sintel-trailer.m4v">mp4</a>, <a href="http://corrupt-system.de/assets/media/sintel/sintel-trailer.webm">webm</a>)</p>
Expand Down
2 changes: 1 addition & 1 deletion demos/demos/themes/themes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</form>
<div class="mediaplayer videoplayer">
<video controls preload="none" poster="http://corrupt-system.de/assets/media/caminandes/caminandes.jpg">
<source src="http://corrupt-system.de/assets/media/caminandes/caminandes.mp4" type="video/mp4" />
<source src="http://corrupt-system.de/assets/media/caminandes/caminandes.m4v" type="video/mp4" />
<source src="http://corrupt-system.de/assets/media/caminandes/caminandes.webm" />
<p>You need a modern Browser or install the Flash Plugin or simply download the video (<a href="http://corrupt-system.de/assets/media/sintel/sintel-trailer.m4v">mp4</a>, <a href="http://corrupt-system.de/assets/media/sintel/sintel-trailer.webm">webm</a>)</p>
</video>
Expand Down
4 changes: 2 additions & 2 deletions demos/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<div id="sidebar" class="interface">

<a class="toc_title"> Webshim <span class="version">(<span class="ws-version">1.14.3-RC3</span>)</span></a>
<a class="toc_title"> Webshim <span class="version">(<span class="ws-version">1.14.3</span>)</span></a>
<ul class="toc_section">
<li>
&raquo; <a href="https://github.com/aFarkas/webshim">GitHub Repository</a>
Expand Down Expand Up @@ -139,7 +139,7 @@
<h3 id="downloads">Downloads &amp; Dependencies</h3>
<span style="padding-left: 7px; font-size:11px; font-weight: normal;" class="interface">(Right-click, and use "Save As")</span>
<p>
<a href="https://github.com/aFarkas/webshim/archive/1.14.3-RC3.zip" class="download-button"> <strong><i>Download</i></strong> </a>
<a href="https://github.com/aFarkas/webshim/archive/1.14.3.zip" class="download-button"> <strong><i>Download</i></strong> </a>
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion js-webshim/dev/polyfiller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
path = path.split('?')[0].slice(0, path.lastIndexOf("/") + 1) + 'shims/';

$.extend(webshims, {
version: '1.14.3-RC3',
version: '1.14.3',
cfg: {
enhanceAuto: window.Audio && (!window.matchMedia || matchMedia('(min-device-width: 721px)').matches),
//addCacheBuster: false,
Expand Down
14 changes: 11 additions & 3 deletions js-webshim/dev/shims/combos/19.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4594,13 +4594,21 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u

if(hasFlash && $.cleanData){
var oldClean = $.cleanData;
var objElem = document.createElement('object');
var noRemove = {
SetVariable: 1,
GetVariable: 1,
SetReturnValue: 1,
GetReturnValue: 1
};
var flashNames = {
object: 1,
OBJECT: 1
};

$.cleanData = function(elems){
var i, len, prop;
var ret = oldClean.apply(this, arguments);
if(elems && (len = elems.length) && loadedSwf){

for(i = 0; i < len; i++){
Expand All @@ -4610,7 +4618,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
elems[i].api_pause();
if(elems[i].readyState == 4){
for (prop in elems[i]) {
if (typeof elems[i][prop] == "function") {
if (!noRemove[prop] && !objElem[prop] && typeof elems[i][prop] == "function") {
elems[i][prop] = null;
}
}
Expand All @@ -4620,7 +4628,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
}

}
return oldClean.apply(this, arguments);
return ret;
};
}

Expand Down Expand Up @@ -4713,7 +4721,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
$('audio, video').each(function(){
webshims.mediaelement.selectSource(this);
});
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error')+ 'first error: '+ error);
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.currentSrc+" Mediaerror: "+ media.prop('error')+ ' error.code: '+ error.code);
}
webshims.warn('There was a mediaelement error. Run the following line in your console to get more info: webshim.mediaelement.loadDebugger();')
}
Expand Down
14 changes: 11 additions & 3 deletions js-webshim/dev/shims/combos/20.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4371,13 +4371,21 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u

if(hasFlash && $.cleanData){
var oldClean = $.cleanData;
var objElem = document.createElement('object');
var noRemove = {
SetVariable: 1,
GetVariable: 1,
SetReturnValue: 1,
GetReturnValue: 1
};
var flashNames = {
object: 1,
OBJECT: 1
};

$.cleanData = function(elems){
var i, len, prop;
var ret = oldClean.apply(this, arguments);
if(elems && (len = elems.length) && loadedSwf){

for(i = 0; i < len; i++){
Expand All @@ -4387,7 +4395,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
elems[i].api_pause();
if(elems[i].readyState == 4){
for (prop in elems[i]) {
if (typeof elems[i][prop] == "function") {
if (!noRemove[prop] && !objElem[prop] && typeof elems[i][prop] == "function") {
elems[i][prop] = null;
}
}
Expand All @@ -4397,7 +4405,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
}

}
return oldClean.apply(this, arguments);
return ret;
};
}

Expand Down Expand Up @@ -4490,7 +4498,7 @@ webshims.register('mediaelement-core', function($, webshims, window, document, u
$('audio, video').each(function(){
webshims.mediaelement.selectSource(this);
});
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error')+ 'first error: '+ error);
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.currentSrc+" Mediaerror: "+ media.prop('error')+ ' error.code: '+ error.code);
}
webshims.warn('There was a mediaelement error. Run the following line in your console to get more info: webshim.mediaelement.loadDebugger();')
}
Expand Down
14 changes: 11 additions & 3 deletions js-webshim/dev/shims/combos/21.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1408,13 +1408,21 @@

if(hasFlash && $.cleanData){
var oldClean = $.cleanData;
var objElem = document.createElement('object');
var noRemove = {
SetVariable: 1,
GetVariable: 1,
SetReturnValue: 1,
GetReturnValue: 1
};
var flashNames = {
object: 1,
OBJECT: 1
};

$.cleanData = function(elems){
var i, len, prop;
var ret = oldClean.apply(this, arguments);
if(elems && (len = elems.length) && loadedSwf){

for(i = 0; i < len; i++){
Expand All @@ -1424,7 +1432,7 @@
elems[i].api_pause();
if(elems[i].readyState == 4){
for (prop in elems[i]) {
if (typeof elems[i][prop] == "function") {
if (!noRemove[prop] && !objElem[prop] && typeof elems[i][prop] == "function") {
elems[i][prop] = null;
}
}
Expand All @@ -1434,7 +1442,7 @@
}

}
return oldClean.apply(this, arguments);
return ret;
};
}

Expand Down Expand Up @@ -1527,7 +1535,7 @@
$('audio, video').each(function(){
webshims.mediaelement.selectSource(this);
});
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error')+ 'first error: '+ error);
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.currentSrc+" Mediaerror: "+ media.prop('error')+ ' error.code: '+ error.code);
}
webshims.warn('There was a mediaelement error. Run the following line in your console to get more info: webshim.mediaelement.loadDebugger();')
}
Expand Down
14 changes: 11 additions & 3 deletions js-webshim/dev/shims/combos/25.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2763,13 +2763,21 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine

if(hasFlash && $.cleanData){
var oldClean = $.cleanData;
var objElem = document.createElement('object');
var noRemove = {
SetVariable: 1,
GetVariable: 1,
SetReturnValue: 1,
GetReturnValue: 1
};
var flashNames = {
object: 1,
OBJECT: 1
};

$.cleanData = function(elems){
var i, len, prop;
var ret = oldClean.apply(this, arguments);
if(elems && (len = elems.length) && loadedSwf){

for(i = 0; i < len; i++){
Expand All @@ -2779,7 +2787,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
elems[i].api_pause();
if(elems[i].readyState == 4){
for (prop in elems[i]) {
if (typeof elems[i][prop] == "function") {
if (!noRemove[prop] && !objElem[prop] && typeof elems[i][prop] == "function") {
elems[i][prop] = null;
}
}
Expand All @@ -2789,7 +2797,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
}

}
return oldClean.apply(this, arguments);
return ret;
};
}

Expand Down Expand Up @@ -2882,7 +2890,7 @@ webshims.register('dom-extend', function($, webshims, window, document, undefine
$('audio, video').each(function(){
webshims.mediaelement.selectSource(this);
});
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.src+" Mediaerror: "+ media.prop('error')+ 'first error: '+ error);
webshims.error("switching mediaelements option to 'preferFlash', due to an error with native player: "+e.target.currentSrc+" Mediaerror: "+ media.prop('error')+ ' error.code: '+ error.code);
}
webshims.warn('There was a mediaelement error. Run the following line in your console to get more info: webshim.mediaelement.loadDebugger();')
}
Expand Down
Loading

0 comments on commit 689fc81

Please sign in to comment.