Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2147 from zubair-arbi/zub/bugfix/std1136-emptycoursevideo

Browse Source 
dont update iframe src attribute if it is empty
This commit is contained in:
zubair-arbi
2014-01-16 01:09:17 -08:00
parent f58903a50f 769c7221fa
commit 565769b641
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cms/static/js/spec/utils/handle_iframe_binding_spec.js
View File

@@ -1,7 +1,7 @@
define(
[
"jquery", "underscore",
"js/utils/handle_iframe_binding",
"js/utils/handle_iframe_binding"
],
function ($, _, IframeBinding) {
@@ -33,5 +33,14 @@ function ($, _, IframeBinding) {
'<iframe src="http://www.youtube.com/embed/NHd27UvY-lw?wmode=transparent&amp;allowFullScreen=false" frameborder="0" height="350" width="618"></iframe>' +
'<embed wmode="transparent" type="application/x-shockwave-flash" src="http://www.youtube.com/embed/NHd27UvY-lw" height="315" width="560">');
});
it("does not modify src url of DOM iframe if it is empty", function () {
iframe_html = '<iframe width="618" height="350" src="" frameborder="0" allowfullscreen></iframe>';
doc.body.innerHTML = iframe_html;
IframeBinding.iframeBinding(doc);
expect($(doc).find("iframe")[0].src).toEqual("");
});
});
});

34
cms/static/js/utils/handle_iframe_binding.js
View File

@@ -1,12 +1,12 @@
define(["jquery"], function($) {
var iframeBinding = function (e) {
var target_element = null;
if (typeof(e) == "undefined"){
if (typeof(e) === "undefined") {
target_element = $("iframe, embed");
} else {
if (typeof(e.nodeName) != 'undefined'){
if (typeof(e.nodeName) !== 'undefined') {
target_element = $(e).find("iframe, embed");
} else{
} else {
target_element = e.$("iframe, embed");
}
}
@@ -14,21 +14,27 @@ define(["jquery"], function($) {
};
var modifyTagContent = function (target_element) {
target_element.each(function(){
if ($(this).prop('tagName') == 'IFRAME'){
target_element.each(function() {
if ($(this).prop('tagName') === 'IFRAME') {
var ifr_source = $(this).attr('src');
var wmode = "wmode=transparent";
if(ifr_source.indexOf('?') != -1) {
var getQString = ifr_source.split('?');
if (getQString[1].search('wmode=transparent') == -1){
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr('src',newString+'?'+wmode+'&'+oldString);
// Modify iframe src only if it is not empty
if (ifr_source) {
var wmode = "wmode=transparent";
if (ifr_source.indexOf('?') !== -1) {
var getQString = ifr_source.split('?');
if (getQString[1].search('wmode=transparent') === -1) {
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr('src', newString + '?' + wmode + '&' + oldString);
}
}
else {
$(this).attr('src', ifr_source + '?' + wmode);
}
}
else $(this).attr('src',ifr_source+'?'+wmode);
}
else{
else {
$(this).attr('wmode', 'transparent');
}
});