Merge branch 'merlin'

Leonardo Merlin
2 parents 5a2e06b9 7c349c4b
Showing 2 changed files with 47 additions and 3 deletions Show diff stats
js/main.js
sass/style.sass
@@ -1225,10 +1225,49 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
       e.preventDefault();
     });
  
+    // hack-fix to support z-index over video/iframe
+    function checkIframes () {
+
+      $('iframe').each(function(){
+        var $iframe = $(this);
+        var url = $iframe.attr('src');
+        var c = '?';
+
+        // console.log('url', url);
+        // console.log('url.indexOf("youtube")', url.indexOf("youtube"));
+        if(url.indexOf("youtube") === -1){
+          // is not a iframe of youtube
+          // console.debug('is not a iframe of youtube');
+          return;
+        }
+
+        if(url.indexOf("wmode=opaque") !== -1){
+          // already in opaque mode
+          // console.debug('already in opaque mode');
+          return;
+        }
+
+        if(url.indexOf('?') !== -1){
+          c = '&';
+        }
+        
+        $iframe.attr("src",url+c+"wmode=opaque");
+        // console.debug('iframe changed to opaque mode');
+      });
+
+      setTimeout(checkIframes, 500);
+    }
+    checkIframes();
+    // $(document).bind('DOMSubtreeModified', function(e){
+      // console.log('this', this);
+      // console.log('e', e);
+      
+    // });
+
   });
  
-  window.addEventListener("message", function(ev) {
-    if (ev.data.message === "oauthClientPluginResult") {
+  window.addEventListener('message', function(ev) {
+    if (ev.data.message === 'oauthClientPluginResult') {
       Main.loginCallback(ev.data.logged_in, ev.data.private_token, ev.data.user);
       ev.source.close();
     }
@@ -1488,4 +1488,9 @@ h3.titulo-destaque
     .position
       a
         margin-left: 0
-        margin-top: 5px
 \ No newline at end of file
+        margin-top: 5px
+
+
+// HACK IDG
+#barra-brasil .brasil-flag
+  height: 100% !important
 \ No newline at end of file
...	...	@@ -1225,10 +1225,49 @@ define(['jquery', 'handlebars', 'fastclick', 'handlebars_helpers', 'piwik'], fun
1225	1225	e.preventDefault();
1226	1226	});
1227	1227
	1228	+ // hack-fix to support z-index over video/iframe
	1229	+ function checkIframes () {
	1230	+
	1231	+ $('iframe').each(function(){
	1232	+ var $iframe = $(this);
	1233	+ var url = $iframe.attr('src');
	1234	+ var c = '?';
	1235	+
	1236	+ // console.log('url', url);
	1237	+ // console.log('url.indexOf("youtube")', url.indexOf("youtube"));
	1238	+ if(url.indexOf("youtube") === -1){
	1239	+ // is not a iframe of youtube
	1240	+ // console.debug('is not a iframe of youtube');
	1241	+ return;
	1242	+ }
	1243	+
	1244	+ if(url.indexOf("wmode=opaque") !== -1){
	1245	+ // already in opaque mode
	1246	+ // console.debug('already in opaque mode');
	1247	+ return;
	1248	+ }
	1249	+
	1250	+ if(url.indexOf('?') !== -1){
	1251	+ c = '&';
	1252	+ }
	1253	+
	1254	+ $iframe.attr("src",url+c+"wmode=opaque");
	1255	+ // console.debug('iframe changed to opaque mode');
	1256	+ });
	1257	+
	1258	+ setTimeout(checkIframes, 500);
	1259	+ }
	1260	+ checkIframes();
	1261	+ // $(document).bind('DOMSubtreeModified', function(e){
	1262	+ // console.log('this', this);
	1263	+ // console.log('e', e);
	1264	+
	1265	+ // });
	1266	+
1228	1267	});
1229	1268
1230		- window.addEventListener("message", function(ev) {
1231		- if (ev.data.message === "oauthClientPluginResult") {
	1269	+ window.addEventListener('message', function(ev) {
	1270	+ if (ev.data.message === 'oauthClientPluginResult') {
1232	1271	Main.loginCallback(ev.data.logged_in, ev.data.private_token, ev.data.user);
1233	1272	ev.source.close();
1234	1273	}
...	...
...	...	@@ -1488,4 +1488,9 @@ h3.titulo-destaque
1488	1488	.position
1489	1489	a
1490	1490	margin-left: 0
1491		- margin-top: 5px
1492	1491	\ No newline at end of file
	1492	+ margin-top: 5px
	1493	+
	1494	+
	1495	+// HACK IDG
	1496	+#barra-brasil .brasil-flag
	1497	+ height: 100% !important
1493	1498	\ No newline at end of file
...	...