bachir/Clameurs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logo fond blanc, youtube autoplay

Browse Source
This commit is contained in:
bachir
2017-03-02 18:34:05 +01:00
parent 32c264371e
commit a4bd434e68
12 changed files with 139 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches.d/youtube_autoplay-2685721-4.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/video_embed_field.handlers.inc b/video_embed_field.handlers.inc
index 1962008..b9fe593 100644
--- a/video_embed_field.handlers.inc
+++ b/video_embed_field.handlers.inc
@@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) {
// Construct the embed code.
$settings['wmode'] = 'opaque';
- $settings_str = urlencode(_video_embed_code_get_settings_str($settings));
+ $settings_str = _video_embed_code_get_settings_str($settings);
$output['#markup'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>';
diff --git a/video_embed_field.module b/video_embed_field.module
index 8826ead..e4f4282 100644
--- a/video_embed_field.module
+++ b/video_embed_field.module
@@ -617,7 +617,7 @@ function _video_embed_code_get_settings_str($settings = array()) {
$values[] = $name;
}
else {
- $values[] = $name . '=' . $value;
+ $values[] = $name . '=' . urlencode($value);
}
}
patches.md
+7 -1
View File
@@ -1,3 +1,9 @@
# Field group # Modules Patched
## Field group
compatibility with php 7 compatibility with php 7
https://www.drupal.org/node/2661484 https://www.drupal.org/node/2661484
## video embed
youtube autoplay
https://www.drupal.org/node/2685721#comment-11032685
sites/all/libraries/jquery.domwindow/jquery.DOMWindow.js
+62 -62
View File
@@ -1,17 +1,17 @@
(function($){ (function($){
//closeDOMWindow //closeDOMWindow
$.fn.closeDOMWindow = function(settings){ $.fn.closeDOMWindow = function(settings){
if(!settings){settings={};} if(!settings){settings={};}
var run = function(passingThis){ var run = function(passingThis){
if(settings.anchoredClassName){ if(settings.anchoredClassName){
var $anchorClassName = $('.'+settings.anchoredClassName); var $anchorClassName = $('.'+settings.anchoredClassName);
$anchorClassName.fadeOut('fast',function(){ $anchorClassName.fadeOut('fast',function(){
if($.fn.draggable){ if($.fn.draggable){
$anchorClassName.draggable('destory').trigger("unload").remove(); $anchorClassName.draggable('destory').trigger("unload").remove();
}else{ }else{
$anchorClassName.trigger("unload").remove(); $anchorClassName.trigger("unload").remove();
} }
@@ -21,7 +21,7 @@
var $DOMWindowOverlay = $('#DOMWindowOverlay'); var $DOMWindowOverlay = $('#DOMWindowOverlay');
var $DOMWindow = $('#DOMWindow'); var $DOMWindow = $('#DOMWindow');
$DOMWindowOverlay.fadeOut('fast',function(){ $DOMWindowOverlay.fadeOut('fast',function(){
$DOMWindowOverlay.trigger('unload').unbind().remove(); $DOMWindowOverlay.trigger('unload').unbind().remove();
}); });
$DOMWindow.fadeOut('fast',function(){ $DOMWindow.fadeOut('fast',function(){
if($.fn.draggable){ if($.fn.draggable){
@@ -30,15 +30,15 @@
$DOMWindow.trigger("unload").remove(); $DOMWindow.trigger("unload").remove();
} }
}); });
$(window).unbind('scroll.DOMWindow'); $(window).unbind('scroll.DOMWindow');
$(window).unbind('resize.DOMWindow'); $(window).unbind('resize.DOMWindow');
if($.fn.openDOMWindow.isIE6){$('#DOMWindowIE6FixIframe').remove();} if($.fn.openDOMWindow.isIE6){$('#DOMWindowIE6FixIframe').remove();}
if(settings.functionCallOnClose){settings.functionCallAfterClose();} if(settings.functionCallOnClose){settings.functionCallAfterClose();}
} }
}; };
if(settings.eventType){//if used with $(). if(settings.eventType){//if used with $().
return this.each(function(index){ return this.each(function(index){
$(this).bind(settings.eventType, function(){ $(this).bind(settings.eventType, function(){
@@ -49,19 +49,19 @@
}else{//else called as $.function }else{//else called as $.function
run(); run();
} }
}; };
//allow for public call, pass settings //allow for public call, pass settings
$.closeDOMWindow = function(s){$.fn.closeDOMWindow(s);}; $.closeDOMWindow = function(s){$.fn.closeDOMWindow(s);};
//openDOMWindow //openDOMWindow
$.fn.openDOMWindow = function(instanceSettings){ $.fn.openDOMWindow = function(instanceSettings){
var shortcut = $.fn.openDOMWindow; var shortcut = $.fn.openDOMWindow;
//default settings combined with callerSettings//////////////////////////////////////////////////////////////////////// //default settings combined with callerSettings////////////////////////////////////////////////////////////////////////
shortcut.defaultsSettings = { shortcut.defaultsSettings = {
anchoredClassName:'', anchoredClassName:'',
anchoredSelector:'', anchoredSelector:'',
@@ -84,7 +84,7 @@
positionLeft:0, positionLeft:0,
positionTop:0, positionTop:0,
positionType:'centered', // centered, anchored, absolute, fixed positionType:'centered', // centered, anchored, absolute, fixed
width:500, width:500,
windowBGColor:'#fff', windowBGColor:'#fff',
windowBGImage:null, // http path windowBGImage:null, // http path
windowHTTPType:'get', windowHTTPType:'get',
@@ -94,19 +94,19 @@
windowSourceURL:'', windowSourceURL:'',
windowSourceAttrURL:'href' windowSourceAttrURL:'href'
}; };
var settings = $.extend({}, $.fn.openDOMWindow.defaultsSettings , instanceSettings || {}); var settings = $.extend({}, $.fn.openDOMWindow.defaultsSettings , instanceSettings || {});
//Public functions //Public functions
shortcut.viewPortHeight = function(){ return self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;}; shortcut.viewPortHeight = function(){ return self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;};
shortcut.viewPortWidth = function(){ return self.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;}; shortcut.viewPortWidth = function(){ return self.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;};
shortcut.scrollOffsetHeight = function(){ return self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;}; shortcut.scrollOffsetHeight = function(){ return self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;};
shortcut.scrollOffsetWidth = function(){ return self.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft;}; shortcut.scrollOffsetWidth = function(){ return self.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft;};
shortcut.isIE6 = typeof document.body.style.maxHeight === "undefined"; shortcut.isIE6 = typeof document.body.style.maxHeight === "undefined";
//Private Functions///////////////////////////////////////////////////////////////////////////////////////////////////////// //Private Functions/////////////////////////////////////////////////////////////////////////////////////////////////////////
var sizeOverlay = function(){ var sizeOverlay = function(){
var $DOMWindowOverlay = $('#DOMWindowOverlay'); var $DOMWindowOverlay = $('#DOMWindowOverlay');
if(shortcut.isIE6){//if IE 6 if(shortcut.isIE6){//if IE 6
@@ -115,15 +115,15 @@
$DOMWindowOverlay.css({'height':overlayViewportHeight +'px','width':overlayViewportWidth+'px'}); $DOMWindowOverlay.css({'height':overlayViewportHeight +'px','width':overlayViewportWidth+'px'});
}else{//else Firefox, safari, opera, IE 7+ }else{//else Firefox, safari, opera, IE 7+
$DOMWindowOverlay.css({'height':'100%','width':'100%','position':'fixed'}); $DOMWindowOverlay.css({'height':'100%','width':'100%','position':'fixed'});
} }
}; };
var sizeIE6Iframe = function(){ var sizeIE6Iframe = function(){
var overlayViewportHeight = document.documentElement.offsetHeight + document.documentElement.scrollTop - 4; var overlayViewportHeight = document.documentElement.offsetHeight + document.documentElement.scrollTop - 4;
var overlayViewportWidth = document.documentElement.offsetWidth - 21; var overlayViewportWidth = document.documentElement.offsetWidth - 21;
$('#DOMWindowIE6FixIframe').css({'height':overlayViewportHeight +'px','width':overlayViewportWidth+'px'}); $('#DOMWindowIE6FixIframe').css({'height':overlayViewportHeight +'px','width':overlayViewportWidth+'px'});
}; };
var centerDOMWindow = function() { var centerDOMWindow = function() {
var $DOMWindow = $('#DOMWindow'); var $DOMWindow = $('#DOMWindow');
if(settings.height + 50 > shortcut.viewPortHeight()){//added 50 to be safe if(settings.height + 50 > shortcut.viewPortHeight()){//added 50 to be safe
@@ -133,7 +133,7 @@
$DOMWindow.css('top',Math.round(shortcut.viewPortHeight()/2) + shortcut.scrollOffsetHeight() - Math.round(($DOMWindow.outerHeight())/2)); $DOMWindow.css('top',Math.round(shortcut.viewPortHeight()/2) + shortcut.scrollOffsetHeight() - Math.round(($DOMWindow.outerHeight())/2));
} }
}; };
var centerLoader = function() { var centerLoader = function() {
var $DOMWindowLoader = $('#DOMWindowLoader'); var $DOMWindowLoader = $('#DOMWindowLoader');
if(shortcut.isIE6){//if IE 6 if(shortcut.isIE6){//if IE 6
@@ -142,34 +142,34 @@
}else{ }else{
$DOMWindowLoader.css({'left':'50%','top':'50%','position':'fixed'}); $DOMWindowLoader.css({'left':'50%','top':'50%','position':'fixed'});
} }
}; };
var fixedDOMWindow = function(){ var fixedDOMWindow = function(){
var $DOMWindow = $('#DOMWindow'); var $DOMWindow = $('#DOMWindow');
$DOMWindow.css('left', settings.positionLeft + shortcut.scrollOffsetWidth()); $DOMWindow.css('left', settings.positionLeft + shortcut.scrollOffsetWidth());
$DOMWindow.css('top', + settings.positionTop + shortcut.scrollOffsetHeight()); $DOMWindow.css('top', + settings.positionTop + shortcut.scrollOffsetHeight());
}; };
var showDOMWindow = function(instance){ var showDOMWindow = function(instance){
if(arguments[0]){ if(arguments[0]){
$('.'+instance+' #DOMWindowLoader').remove(); $('.'+instance+' #DOMWindowLoader').remove();
$('.'+instance+' #DOMWindowContent').fadeIn('fast',function(){if(settings.functionCallOnOpen){settings.functionCallOnOpen();}}); $('.'+instance+' #DOMWindowContent').fadeIn('fast',function(){if(settings.functionCallOnOpen){settings.functionCallOnOpen();}});
$('.'+instance+ '.closeDOMWindow').click(function(){ $('.'+instance+ '.closeDOMWindow').click(function(){
$.closeDOMWindow(); $.closeDOMWindow();
return false; return false;
}); });
}else{ }else{
$('#DOMWindowLoader').remove(); $('#DOMWindowLoader').remove();
$('#DOMWindow').fadeIn('fast',function(){if(settings.functionCallOnOpen){settings.functionCallOnOpen();}}); $('#DOMWindow').fadeIn('fast',function(){if(settings.functionCallOnOpen){settings.functionCallOnOpen();}});
$('#DOMWindow .closeDOMWindow').click(function(){ $('#DOMWindow .closeDOMWindow').click(function(){
$.closeDOMWindow(); $.closeDOMWindow();
return false; return false;
}); });
} }
}; };
var urlQueryToObject = function(s){ var urlQueryToObject = function(s){
var query = {}; var query = {};
s.replace(/b([^&=]*)=([^&=]*)b/g, function (m, a, d) { s.replace(/b([^&=]*)=([^&=]*)b/g, function (m, a, d) {
@@ -181,38 +181,38 @@
}); });
return query; return query;
}; };
//Run Routine /////////////////////////////////////////////////////////////////////////////////////////////////////////////// //Run Routine ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
var run = function(passingThis){ var run = function(passingThis){
//get values from element clicked, or assume its passed as an option //get values from element clicked, or assume its passed as an option
settings.windowSourceID = $(passingThis).attr('href') || settings.windowSourceID; settings.windowSourceID = $(passingThis).attr('href') || settings.windowSourceID;
settings.windowSourceURL = $(passingThis).attr(settings.windowSourceAttrURL) || settings.windowSourceURL; settings.windowSourceURL = $(passingThis).attr(settings.windowSourceAttrURL) || settings.windowSourceURL;
settings.windowBGImage = settings.windowBGImage ? 'background-image:url('+settings.windowBGImage+')' : ''; settings.windowBGImage = settings.windowBGImage ? 'background-image:url('+settings.windowBGImage+')' : '';
var urlOnly, urlQueryObject; var urlOnly, urlQueryObject;
if(settings.positionType == 'anchored'){//anchored DOM window if(settings.positionType == 'anchored'){//anchored DOM window
var anchoredPositions = $(settings.anchoredSelector).position(); var anchoredPositions = $(settings.anchoredSelector).position();
var anchoredPositionX = anchoredPositions.left + settings.positionLeft; var anchoredPositionX = anchoredPositions.left + settings.positionLeft;
var anchoredPositionY = anchoredPositions.top + settings.positionTop; var anchoredPositionY = anchoredPositions.top + settings.positionTop;
$('body').append('<div class="'+settings.anchoredClassName+'" style="'+settings.windowBGImage+';background-repeat:no-repeat;padding:'+settings.windowPadding+'px;overflow:auto;position:absolute;top:'+anchoredPositionY+'px;left:'+anchoredPositionX+'px;height:'+settings.height+'px;width:'+settings.width+'px;background-color:'+settings.windowBGColor+';border:'+settings.borderSize+'px solid '+settings.borderColor+';z-index:10001"><div id="DOMWindowContent" style="display:none"></div></div>'); $('body').append('<div class="'+settings.anchoredClassName+'" style="'+settings.windowBGImage+';background-repeat:no-repeat;padding:'+settings.windowPadding+'px;overflow:auto;position:absolute;top:'+anchoredPositionY+'px;left:'+anchoredPositionX+'px;height:'+settings.height+'px;width:'+settings.width+'px;background-color:'+settings.windowBGColor+';border:'+settings.borderSize+'px solid '+settings.borderColor+';z-index:10001"><div id="DOMWindowContent" style="display:none"></div></div>');
//loader //loader
if(settings.loader && settings.loaderImagePath !== ''){ if(settings.loader && settings.loaderImagePath !== ''){
$('.'+settings.anchoredClassName).append('<div id="DOMWindowLoader" style="width:'+settings.loaderWidth+'px;height:'+settings.loaderHeight+'px;"><img src="'+settings.loaderImagePath+'" /></div>'); $('.'+settings.anchoredClassName).append('<div id="DOMWindowLoader" style="width:'+settings.loaderWidth+'px;height:'+settings.loaderHeight+'px;"><img src="'+settings.loaderImagePath+'" /></div>');
} }
if($.fn.draggable){ if($.fn.draggable){
if(settings.draggable){$('.' + settings.anchoredClassName).draggable({cursor:'move'});} if(settings.draggable){$('.' + settings.anchoredClassName).draggable({cursor:'move'});}
} }
switch(settings.windowSource){ switch(settings.windowSource){
case 'inline'://////////////////////////////// inline ////////////////////////////////////////// case 'inline'://////////////////////////////// inline //////////////////////////////////////////
$('.' + settings.anchoredClassName+" #DOMWindowContent").append($(settings.windowSourceID).children()); $('.' + settings.anchoredClassName+" #DOMWindowContent").append($(settings.windowSourceID).children());
$('.' + settings.anchoredClassName).unload(function(){// move elements back when you're finished $('.' + settings.anchoredClassName).unload(function(){// move elements back when you're finished
$('.' + settings.windowSourceID).append( $('.' + settings.anchoredClassName+" #DOMWindowContent").children()); $('.' + settings.windowSourceID).append( $('.' + settings.anchoredClassName+" #DOMWindowContent").children());
}); });
showDOMWindow(settings.anchoredClassName); showDOMWindow(settings.anchoredClassName);
break; break;
@@ -220,9 +220,9 @@
$('.' + settings.anchoredClassName+" #DOMWindowContent").append('<iframe frameborder="0" hspace="0" wspace="0" src="'+settings.windowSourceURL+'" name="DOMWindowIframe'+Math.round(Math.random()*1000)+'" style="width:100%;height:100%;border:none;background-color:#fff;" class="'+settings.anchoredClassName+'Iframe" ></iframe>'); $('.' + settings.anchoredClassName+" #DOMWindowContent").append('<iframe frameborder="0" hspace="0" wspace="0" src="'+settings.windowSourceURL+'" name="DOMWindowIframe'+Math.round(Math.random()*1000)+'" style="width:100%;height:100%;border:none;background-color:#fff;" class="'+settings.anchoredClassName+'Iframe" ></iframe>');
$('.'+settings.anchoredClassName+'Iframe').load(showDOMWindow(settings.anchoredClassName)); $('.'+settings.anchoredClassName+'Iframe').load(showDOMWindow(settings.anchoredClassName));
break; break;
case 'ajax'://////////////////////////////// ajax ////////////////////////////////////////// case 'ajax'://////////////////////////////// ajax //////////////////////////////////////////
if(settings.windowHTTPType == 'post'){ if(settings.windowHTTPType == 'post'){
if(settings.windowSourceURL.indexOf("?") !== -1){//has a query string if(settings.windowSourceURL.indexOf("?") !== -1){//has a query string
urlOnly = settings.windowSourceURL.substr(0, settings.windowSourceURL.indexOf("?")); urlOnly = settings.windowSourceURL.substr(0, settings.windowSourceURL.indexOf("?"));
urlQueryObject = urlQueryToObject(settings.windowSourceURL); urlQueryObject = urlQueryToObject(settings.windowSourceURL);
@@ -244,9 +244,9 @@
} }
break; break;
} }
}else{//centered, fixed, absolute DOM window }else{//centered, fixed, absolute DOM window
//overlay & modal //overlay & modal
if(settings.overlay){ if(settings.overlay){
$('body').append('<div id="DOMWindowOverlay" style="z-index:10000;display:none;position:absolute;top:0;left:0;background-color:'+settings.overlayColor+';filter:alpha(opacity='+settings.overlayOpacity+');-moz-opacity: 0.'+settings.overlayOpacity+';opacity: 0.'+settings.overlayOpacity+';"></div>'); $('body').append('<div id="DOMWindowOverlay" style="z-index:10000;display:none;position:absolute;top:0;left:0;background-color:'+settings.overlayColor+';filter:alpha(opacity='+settings.overlayOpacity+');-moz-opacity: 0.'+settings.overlayOpacity+';opacity: 0.'+settings.overlayOpacity+';"></div>');
@@ -259,7 +259,7 @@
$DOMWindowOverlay.fadeIn('fast'); $DOMWindowOverlay.fadeIn('fast');
if(!settings.modal){$DOMWindowOverlay.click(function(){$.closeDOMWindow();});} if(!settings.modal){$DOMWindowOverlay.click(function(){$.closeDOMWindow();});}
} }
//loader //loader
if(settings.loader && settings.loaderImagePath !== ''){ if(settings.loader && settings.loaderImagePath !== ''){
$('body').append('<div id="DOMWindowLoader" style="z-index:10002;width:'+settings.loaderWidth+'px;height:'+settings.loaderHeight+'px;"><img src="'+settings.loaderImagePath+'" /></div>'); $('body').append('<div id="DOMWindowLoader" style="z-index:10002;width:'+settings.loaderWidth+'px;height:'+settings.loaderHeight+'px;"><img src="'+settings.loaderImagePath+'" /></div>');
@@ -268,7 +268,7 @@
//add DOMwindow //add DOMwindow
$('body').append('<div id="DOMWindow" style="background-repeat:no-repeat;'+settings.windowBGImage+';overflow:auto;padding:'+settings.windowPadding+'px;display:none;height:'+settings.height+'px;width:'+settings.width+'px;background-color:'+settings.windowBGColor+';border:'+settings.borderSize+'px solid '+settings.borderColor+'; position:absolute;z-index:10001"></div>'); $('body').append('<div id="DOMWindow" style="background-repeat:no-repeat;'+settings.windowBGImage+';overflow:auto;padding:'+settings.windowPadding+'px;display:none;height:'+settings.height+'px;width:'+settings.width+'px;background-color:'+settings.windowBGColor+';border:'+settings.borderSize+'px solid '+settings.borderColor+'; position:absolute;z-index:10001"></div>');
var $DOMWindow = $('#DOMWindow'); var $DOMWindow = $('#DOMWindow');
//centered, absolute, or fixed //centered, absolute, or fixed
switch(settings.positionType){ switch(settings.positionType){
@@ -292,10 +292,10 @@
var anchoredPositionX = anchoredPositions.left + settings.positionLeft; var anchoredPositionX = anchoredPositions.left + settings.positionLeft;
var anchoredPositionY = anchoredPositions.top + settings.positionTop; var anchoredPositionY = anchoredPositions.top + settings.positionTop;
$DOMWindow.css({'top':anchoredPositionY + 'px','left':anchoredPositionX+'px'}); $DOMWindow.css({'top':anchoredPositionY + 'px','left':anchoredPositionX+'px'});
break; break;
} }
$(window).bind('scroll.DOMWindow',function(){ $(window).bind('scroll.DOMWindow',function(){
if(settings.overlay){sizeOverlay();} if(settings.overlay){sizeOverlay();}
if(shortcut.isIE6){sizeIE6Iframe();} if(shortcut.isIE6){sizeIE6Iframe();}
@@ -308,12 +308,12 @@
if(settings.overlay){sizeOverlay();} if(settings.overlay){sizeOverlay();}
if(settings.positionType == 'centered'){centerDOMWindow();} if(settings.positionType == 'centered'){centerDOMWindow();}
}); });
switch(settings.windowSource){ switch(settings.windowSource){
case 'inline'://////////////////////////////// inline ////////////////////////////////////////// case 'inline'://////////////////////////////// inline //////////////////////////////////////////
$DOMWindow.append($(settings.windowSourceID).children()); $DOMWindow.append($(settings.windowSourceID).children());
$DOMWindow.unload(function(){// move elements back when you're finished $DOMWindow.unload(function(){// move elements back when you're finished
$(settings.windowSourceID).append($DOMWindow.children()); $(settings.windowSourceID).append($DOMWindow.children());
}); });
showDOMWindow(); showDOMWindow();
break; break;
@@ -323,7 +323,7 @@
break; break;
case 'ajax'://////////////////////////////// ajax ////////////////////////////////////////// case 'ajax'://////////////////////////////// ajax //////////////////////////////////////////
if(settings.windowHTTPType == 'post'){ if(settings.windowHTTPType == 'post'){
if(settings.windowSourceURL.indexOf("?") !== -1){//has a query string if(settings.windowSourceURL.indexOf("?") !== -1){//has a query string
urlOnly = settings.windowSourceURL.substr(0, settings.windowSourceURL.indexOf("?")); urlOnly = settings.windowSourceURL.substr(0, settings.windowSourceURL.indexOf("?"));
urlQueryObject = urlQueryToObject(settings.windowSourceURL); urlQueryObject = urlQueryToObject(settings.windowSourceURL);
@@ -345,25 +345,25 @@
} }
break; break;
} }
}//end if anchored, or absolute, fixed, centered }//end if anchored, or absolute, fixed, centered
};//end run() };//end run()
if(settings.eventType){//if used with $(). if(settings.eventType){//if used with $().
return this.each(function(index){ return this.each(function(index){
$(this).bind(settings.eventType,function(){ $(this).bind(settings.eventType,function(){
run(this); run(this);
return false; return false;
}); });
}); });
}else{//else called as $.function }else{//else called as $.function
run(); run();
} }
};//end function openDOMWindow };//end function openDOMWindow
//allow for public call, pass settings //allow for public call, pass settings
$.openDOMWindow = function(s){$.fn.openDOMWindow(s);}; $.openDOMWindow = function(s){$.fn.openDOMWindow(s);};
})(jQuery); })(jQuery);
sites/all/modules/contrib/fields/video_embed_field/.rej
+11
View File
@@ -0,0 +1,11 @@
--- video_embed_field.handlers.inc
+++ video_embed_field.handlers.inc
@@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) {
// Construct the embed code.
$settings['wmode'] = 'opaque';
- $settings_str = urlencode(_video_embed_code_get_settings_str($settings));
+ $settings_str = _video_embed_code_get_settings_str($settings);
$output['#markup'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>';
sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc
+1 -1
View File
@@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) {
// Construct the embed code. // Construct the embed code.
$settings['wmode'] = 'opaque'; $settings['wmode'] = 'opaque';
$settings_str = urlencode(_video_embed_code_get_settings_str($settings)); $settings_str = _video_embed_code_get_settings_str($settings);
$output['#markup'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>'; $output['#markup'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>';
sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module
+1 -1
View File
@@ -617,7 +617,7 @@ function _video_embed_code_get_settings_str($settings = array()) {
$values[] = $name; $values[] = $name;
} }
else { else {
$values[] = $name . '=' . $value; $values[] = $name . '=' . urlencode($value);
} }
} }
sites/all/modules/figureslibres/clameursmod/clameursmod.js
+11 -4
View File
@@ -70,11 +70,18 @@
width:w, width:w,
height:h, height:h,
windowSourceID:"#videoframe", windowSourceID:"#videoframe",
functionCallOnClose:true, // functionCallOnClose:function(){
functionCallAfterClose:function(){ // console.log('overlay closed');
$('#videoframe').remove(); // $('#videoframe').remove();
} // },
// functionCallAfterClose:function(){
// console.log('overlay closed');
// $('#videoframe').remove();
// }
}); });
// autoplay vid youtube
// see patch https://www.drupal.org/node/2685721#comment-11032685
}; };
function onCloseOverlay(){ function onCloseOverlay(){
sites/all/modules/figureslibres/clameursmod/clameursmod.module
+1 -1
View File
@@ -33,7 +33,7 @@ function _clameursmod_getemvidfield(){
$data['test'] = "OK"; $data['test'] = "OK";
$data['src'] = $_GET['src']; $data['src'] = $_GET['src'];
$data['embed'] = theme('video_embed_field_embed_code', array('url'=>$data['src'])); $data['embed'] = theme('video_embed_field_embed_code', array('url'=>$data['src'], 'style'=>'normal'));
drupal_json_output($data); drupal_json_output($data);
} }
sites/all/themes/figureslibres/clameurs/css/dist/styles.css
Vendored
+3 -2
View File
@@ -81,7 +81,8 @@ input {
#header h2 { #header h2 {
text-align: center; text-align: center;
color: #20c498; color: #20c498;
font-size: 1em; } font-size: 1em;
font-weight: 500; }
@media only screen and (min-width: 62.5625em) { @media only screen and (min-width: 62.5625em) {
#header h2 { #header h2 {
font-size: 2em; } } font-size: 2em; } }
@@ -385,7 +386,7 @@ input {
display: block; } } display: block; } }
.node-thematique .content article.main .field-name-body .value p { .node-thematique .content article.main .field-name-body .value p {
font-size: 1em; font-size: 1em;
padding: 1em 1em 0; padding: 1em 1em 0 1.5em;
line-height: 1.3; line-height: 1.3;
margin: 0; margin: 0;
background-color: #fff; } background-color: #fff; }
sites/all/themes/figureslibres/clameurs/css/styles.scss
+2 -1
View File
@@ -146,6 +146,7 @@ $header_height_large:400px;
text-align: center; text-align: center;
color:$vert; color:$vert;
font-size: 1em; font-size: 1em;
font-weight: 500;
@media #{$large-up} { @media #{$large-up} {
font-size: 2em; font-size: 2em;
} }
@@ -442,7 +443,7 @@ $header_height_large:400px;
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
p{ p{
font-size: 1em; padding: 1em 1em 0; line-height: 1.3; margin:0; font-size: 1em; padding: 1em 1em 0 1.5em; line-height: 1.3; margin:0;
background-color: #fff; background-color: #fff;
} }
} }
sites/all/themes/figureslibres/clameurs/images/logo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 63 KiB

sites/all/themes/figureslibres/clameurs/images/logo.svg
+14 -6
View File
@@ -16,7 +16,7 @@
viewBox="0 0 105.83333 88.63542" viewBox="0 0 105.83333 88.63542"
version="1.1" version="1.1"
id="svg11621" id="svg11621"
inkscape:version="0.92.0 r" inkscape:version="0.92.1 r"
sodipodi:docname="logo.svg" sodipodi:docname="logo.svg"
inkscape:export-filename="/home/bach/Sites/clameurs.org/sites/all/themes/figureslibres/clameurs/images/logo.png" inkscape:export-filename="/home/bach/Sites/clameurs.org/sites/all/themes/figureslibres/clameurs/images/logo.png"
inkscape:export-xdpi="97.139999" inkscape:export-xdpi="97.139999"
@@ -3239,9 +3239,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="2.8" inkscape:zoom="1.4"
inkscape:cx="120.57866" inkscape:cx="184.17994"
inkscape:cy="-8.7275343" inkscape:cy="202.6864"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@@ -3250,7 +3250,8 @@
inkscape:window-height="1025" inkscape:window-height="1025"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="28" inkscape:window-y="28"
inkscape:window-maximized="1" /> inkscape:window-maximized="1"
inkscape:pagecheckerboard="true" />
<metadata <metadata
id="metadata11618"> id="metadata11618">
<rdf:RDF> <rdf:RDF>
@@ -3259,7 +3260,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title /> <dc:title></dc:title>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -3268,6 +3269,13 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(0,-208.36456)"> transform="translate(0,-208.36456)">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.85208333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect5019"
width="88.167168"
height="55.940956"
x="11.150297"
y="233.87796" />
<g <g
id="g13367" id="g13367"
transform="translate(-6.1392243,202.36529)"> transform="translate(-6.1392243,202.36529)">
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 113 KiB