[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linterna-magica-commit] [402] Switching between HTMl5, Flash and Linter
|
From: |
Ivaylo Valkov |
|
Subject: |
[linterna-magica-commit] [402] Switching between HTMl5, Flash and Linterna Magica is derecated. |
|
Date: |
Mon, 06 May 2013 14:37:53 +0000 |
Revision: 402
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=402
Author: valkov
Date: 2013-05-06 14:37:53 +0000 (Mon, 06 May 2013)
Log Message:
-----------
Switching between HTMl5, Flash and Linterna Magica is derecated. The default
behaviour is to replace the default player of the website.
Modified Paths:
--------------
trunk/data/style/template.css
trunk/src/lm_config_options.js
trunk/src/lm_constructors.js
trunk/src/lm_create_video_object.js
trunk/src/lm_init_options.js
trunk/src/lm_interface_player_web_buttons.js
trunk/src/lm_site_dailymotion.js
trunk/src/lm_site_indieflixcom.js
trunk/src/lm_site_vimeo.js
trunk/src/lm_site_youtube.js
Removed Paths:
-------------
trunk/src/lm_interface_toggle_plugin.js
Modified: trunk/data/style/template.css
===================================================================
--- trunk/data/style/template.css 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/data/style/template.css 2013-05-06 14:37:53 UTC (rev 402)
@@ -1,7 +1,7 @@
/*
This CSS file is part of Linterna Mágica
- Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
+ Copyright (C) 2010, 2011, 2012, 2013 Ivaylo Valkov <address@hidden>
Copyright (C) 2010, 2011, 2012 Anton Katsarov <address@hidden>
Linterna Mágica is free software: you can redistribute it and/or modify
@@ -76,7 +76,6 @@
/* The logo/about link in the header */
/* The link that switches between LinternaMagica and the plugin */
/* (the bottom of a flash object) */
-.linterna-magica-toggle-plugin,
/* The buton around clips in remote pages */
.linterna-magica-remote-clip-buttons a {
display: block !important;
@@ -108,8 +107,8 @@
width: 24px !important;
background: url('button-about-lower.png') 0 0 no-repeat !important;
}
-.linterna-magica-remote-clip-buttons,
-.linterna-magica-toggle-plugin-wrapper {
+
+.linterna-magica-remote-clip-buttons {
position:relative!important;
z-index: 999999 !important;
display: block !important;
@@ -121,28 +120,7 @@
top: 0px !important;
}
-.linterna-magica-toggle-plugin-outer-frame {
- display: block !important;
- width: 106px !important;
- height: 24px !important;
- position: absolute !important;
- right: 0 !important;
- top: 0 !important;
- background-color: #666666 !important;
- background-image: -webkit-gradient(linear, left top, left bottom,
from(#666666), to(#1a1a1a)) !important;
- background-image: -webkit-linear-gradient(top, #666666, #1a1a1a)
!important;
- background-image: -moz-linear-gradient(top, #666666, #1a1a1a)
!important;
- background-image: linear-gradient(to bottom, #666666, #1a1a1a)
!important;
- border-color: #222222 !important;
- border-width: 1px 0 !important;
- border-style: solid !important;
- -webkit-border-radius: 6px 6px 0 0 !important;
- -moz-border-radius: 6px 6px 0 0 !important;
- border-radius: 6px 6px 0 0 !important;
-}
-
-
.linterna-magica-remote-clip-buttons a {
float: right !important;
right: 0px !important;
@@ -367,34 +345,7 @@
float: right !important;
}
-/* The link that switches between LinternaMagica and the plugin */
-/* (header) */
-.linterna-magica-toggle-plugin-header {
- background: url('button-toggle-plugin.png') 0 0 no-repeat !important;
- height: 24px !important;
- width: 24px !important;
- position: relative !important;
- text-decoration: none !important;
- padding: 0px !important;
- overflow: hidden !important;
- line-height: 3000px !important;
- outline: none !important;
- display: block !important;
- float: left !important;
-}
-.linterna-magica-toggle-plugin-header {
- position: relative !important;
- text-decoration: none !important;
- padding: 0px !important;
- overflow: hidden !important;
- line-height: 3000px !important;
- outline: none !important;
- display: block !important;
- float: right !important;
-}
-
-
/* time && volume slider text (span) */
.linterna-magica-controls-slider-text {
top: -20px !important;
Modified: trunk/src/lm_config_options.js
===================================================================
--- trunk/src/lm_config_options.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_config_options.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -43,79 +43,6 @@
this.process_cookies = set_cookies_to;
}
-// Check the flash plugin status (installed/not installed) and
-// set this.priority according to configuration
-LinternaMagica.prototype.set_priority = function(priority)
-{
- var std_priority = new Object();
-
- std_priority.html5 = 13;
- std_priority.self = 12;
- std_priority.plugin = 11;
- std_priority.options = 3;
-
- // If not valid value force to self
- if (!priority ||
- typeof(priority) !== "string")
- {
- priority = "html5,self,plugin";
- }
-
- // Clear whitespace
- priority = priority.replace(/\s*/g,"");
-
- // Array [html5, self, plugin]
- var set_priority_to = priority.split(/,/) ;
-
- var t = new Object();
- t.options = 0;
-
- for (var i=0, l=set_priority_to.length; i< l; i++)
- {
- var o = set_priority_to[i];
-
-
- // Check for valid option and use only them
- if (/plugin/i.test(o) || /self/i.test(o) || /html5/i.test(o))
- {
- // The first element has higher priority and the last one
- // has lowest. Mimic std_priority values (13, 12, 11)
- t[o] = (l+10) - i;
- t.options ++;
- }
- }
-
- if (!t.options)
- {
- set_priority_to = std_priority;
- }
- else
- {
- // Set the extracted values. In cases where only few options
- // are set by the user, values for the missing options are
- // calculated as "std_priority.val - 10". This way they will
- // not have the standard priority and will not have higher
- // priority then the user defined.
- set_priority_to = new Object();
- set_priority_to.html5 = t.html5 ? t.html5 : (std_priority.html5 -10);
- set_priority_to.self = t.self ? t.self : (std_priority.self - 10);
- set_priority_to.plugin = t.plugin ? t.plugin : (std_priority.plugin -
10);
- set_priority_to.options = 3;
- }
-
- if (!this.plugin_is_installed &&
- (set_priority_to.plugin > set_priority_to.self))
- {
- // Switch the values/places of self and plugin, if no plugin
- // installed and plugin has higher priority then self.
- t = set_priority_to.self;
- set_priority_to.self = set_priority_to.plugin;
- set_priority_to.plugin = t;
- }
-
- this.priority = set_priority_to;
-}
-
// Check configuration options and set the types of controls
// for the video plugin (web/plguin control)
LinternaMagica.prototype.set_controls = function(controls)
Modified: trunk/src/lm_constructors.js
===================================================================
--- trunk/src/lm_constructors.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_constructors.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -91,7 +91,6 @@
// Do not change order
this.check_flash_plugin();
- this.set_priority(params.priority);
this.set_autostart(params.autostart);
this.set_controls(params.controls);
this.set_cookies(params.cookies);
Modified: trunk/src/lm_create_video_object.js
===================================================================
--- trunk/src/lm_create_video_object.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_create_video_object.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -3,7 +3,7 @@
//
// This file is part of Linterna Mágica
//
-// Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
+// Copyright (C) 2010, 2011, 2012, 2013 Ivaylo Valkov <address@hidden>
// Copyright (C) 2010 Anton Katsarov <address@hidden>
//
// The JavaScript code in this page (or file) is free software: you
@@ -46,10 +46,7 @@
// -1 = bottom border of the object
object_data.outer_height = object_data.height-1;
object_data.height -= this.controls ? 36 : 24;
-
- var toggle_plugin = null;
-
var id = object_data.linterna_magica_id;
this.log("LinternaMagica.create_video_object:\n"+
"Creating video object with linterna_magica_id "+id,2);
@@ -122,9 +119,6 @@
var site_html5_player =
this.find_site_html5_player_wrapper(object_data.parent);
- var toggle_plugin_switch_type =
- site_html5_player ? "html5" : "plugin";
-
object_tag.setAttribute("width", object_data.width);
object_tag.setAttribute("height", object_data.height);
object_tag.setAttribute("id","linterna-magica-video-object-"+id);
@@ -216,47 +210,8 @@
object_tag.linterna_magica_id =
parseFloat(object_data.linterna_magica_id+".1");
- // Add link after the object/embed
- // this.set_priority() has set this.priority
- // to self if there is no plugin
if (this.plugin_is_installed || site_html5_player)
{
- toggle_plugin =
- this.create_toggle_plugin_link("link-not-in-header", id,
- toggle_plugin_switch_type);
-
- var before = null;
-
- if (this.plugin_is_installed && !site_html5_player)
- {
- before = this.get_flash_video_object(id) ?
- this.get_flash_video_object(id) : null;
- }
- else if (site_html5_player)
- {
- before = site_html5_player;
- }
-
- if (before && before.nextSibling)
- {
- object_data.parent.insertBefore(toggle_plugin, before.nextSibling);
- }
- else
- {
- object_data.parent.appendChild(toggle_plugin);
- }
-
- if (((this.priority.self > this.priority.plugin) &&
- this.plugin_is_installed && !site_html5_player) ||
- ((this.priority.self > this.priority.html5) &&
- site_html5_player))
- {
- // Hide the toggle plugin button only if self has higher
- // priority then plugin and html5.
- toggle_plugin.style.setProperty("display", "none",
- "important");
- }
-
this.add_css_class(object_data.parent,
"linterna-magica-ws-video-parent");
}
@@ -280,11 +235,7 @@
}
// Remove/hide the object if it is in DOM
- if ((((this.priority.self > this.priority.plugin) &&
- !site_html5_player) ||
- ((this.priority.self > this.priority.html5) &&
- site_html5_player)) &&
- site_player &&
+ if (site_player &&
// The object is still in DOM some scripts remove it
site_player.parentNode)
{
@@ -304,35 +255,20 @@
}
}
- if (toggle_plugin)
+ if (object_data.use_sibling)
{
- object_data.parent.insertBefore(container, toggle_plugin);
+ object_data.parent.insertBefore(
+ container,
+ object_data.use_sibling);
}
else
{
- if (object_data.use_sibling)
+ if (object_data.parent)
{
- object_data.parent.insertBefore(
- container,
- object_data.use_sibling);
+ object_data.parent.appendChild(container);
}
- else
- {
- if (object_data.parent)
- {
- object_data.parent.appendChild(container);
- }
- }
}
- if (((this.priority.self < this.priority.plugin) &&
- this.plugin_is_installed) ||
- ((this.priority.self < this.priority.html5) &&
- site_html5_player))
- {
- this.hide_lm_interface(object_data.linterna_magica_id);
- }
-
// Objects extracted from script usually does not have cloned object
// For example youtube
if (site_player)
@@ -380,9 +316,7 @@
}
// Init the web controls functions
- // only if Linterna Mágica has priority
- if (this.controls &&
- (this.priority.self > this.priority.plugin))
+ if (this.controls)
{
this.player.init.apply(this,[id]);
}
Modified: trunk/src/lm_init_options.js
===================================================================
--- trunk/src/lm_init_options.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_init_options.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -53,16 +53,6 @@
// configured.
// off/disabled/no/never/false/0: Do not check
"updates": "1w",
- // This options determines how opbject found by Linterna Mágica
- // should be played. You can set multiple values separated with
- // ",", without the quotes. Default value is "html5, self,
- // plugin".
- // self: Replace the flash object
- // plugin: Add link after the swf object that replaces it
- // html5: Add link after the HTMl5 player (if a site provides
- // one) that replaces it
- // Default value "html5, self, plugin"
- "priority": "html5, self, plugin",
// Automatically start the video playback
// enabled: Auto start the clip (default)
// disabled: Do not start the clip
Modified: trunk/src/lm_interface_player_web_buttons.js
===================================================================
--- trunk/src/lm_interface_player_web_buttons.js 2013-05-01 10:07:38 UTC
(rev 401)
+++ trunk/src/lm_interface_player_web_buttons.js 2013-05-06 14:37:53 UTC
(rev 402)
@@ -3,7 +3,7 @@
//
// This file is part of Linterna Mágica
//
-// Copyright (C) 2010, 2011 Ivaylo Valkov <address@hidden>
+// Copyright (C) 2010, 2011, 2013 Ivaylo Valkov <address@hidden>
// Copyright (C) 2010 Anton Katsarov <address@hidden>
//
// The JavaScript code in this page (or file) is free software: you
@@ -288,20 +288,6 @@
var site_html5_player =
this.find_site_html5_player_wrapper(object_data.parent);
- var toggle_plugin_switch_type =
- site_html5_player ? "html5" : "plugin";
-
- // If the plugin is not installed this is useless
- if (this.plugin_is_installed || site_html5_player)
- {
- // append before download link (first button in the header)
- var toggle_plugin =
- this.create_toggle_plugin_link(null,id,
- toggle_plugin_switch_type);
-
- controls.appendChild(toggle_plugin);
- }
-
// Log to web
if (this.debug_level && this.log_to == "web")
{
Deleted: trunk/src/lm_interface_toggle_plugin.js
===================================================================
--- trunk/src/lm_interface_toggle_plugin.js 2013-05-01 10:07:38 UTC (rev
401)
+++ trunk/src/lm_interface_toggle_plugin.js 2013-05-06 14:37:53 UTC (rev
402)
@@ -1,254 +0,0 @@
-// @licstart The following is the entire license notice for the
-// JavaScript code in this page (or file).
-//
-// This file is part of Linterna Mágica
-//
-// Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
-// Copyright (C) 2010 Anton Katsarov <address@hidden>
-//
-// The JavaScript code in this page (or file) is free software: you
-// can redistribute it and/or modify it under the terms of the GNU
-// General Public License (GNU GPL) as published by the Free Software
-// Foundation, either version 3 of the License, or (at your option)
-// any later version. The code is distributed WITHOUT ANY WARRANTY
-// without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
-//
-// As additional permission under GNU GPL version 3 section 7, you
-// may distribute non-source (e.g., minimized or compacted) forms of
-// that code without the copy of the GNU GPL normally required by
-// section 4, provided you include this license notice and a URL
-// through which recipients can access the Corresponding Source.
-//
-// @licend The above is the entire license notice for the JavaScript
-// code in this page (or file).
-//
-// @source http://linterna-magica.nongnu.org
-
-// END OF LICENSE HEADER
-
-// Create the link/button to switch between flash plugin or HTML5
-// player and Linterna Mágica
-LinternaMagica.prototype.create_toggle_plugin_link =
-function(not_in_header,id,switch_type)
-{
- var toggle_plugin = document.createElement("a");
- var self = this;
- var wrapper = null;
-
- toggle_plugin.setAttribute("href", "#");
-
- if (not_in_header)
- {
- toggle_plugin.setAttribute("class", "linterna-magica-toggle-plugin");
- }
-
- var toggle_plugin_click_function = function(ev)
- {
- var el = this;
- self.toggle_plugin.apply(self, [ev, el]);
- };
-
- toggle_plugin.addEventListener("click",
- toggle_plugin_click_function, false);
-
- if (not_in_header)
- {
-
- toggle_plugin.textContent = "Linterna Mágica >>";
- toggle_plugin.setAttribute("id",
- "linterna-magica-toggle-plugin-"+id);
-
- var span = document.createElement("span");
- span.setAttribute("class", "linterna-magica-toggle-plugin-outer-frame");
- span.appendChild(toggle_plugin);
-
- wrapper = document.createElement("p");
- wrapper.appendChild(span);
- wrapper.setAttribute("class", "linterna-magica-toggle-plugin-wrapper");
- }
- else
- {
- if (/html5/i.test(switch_type))
- {
- toggle_plugin.textContent = this._("HTML5");
- }
- else
- {
- toggle_plugin.textContent = this._("Plugin");
- }
-
- toggle_plugin.setAttribute("class",
- "linterna-magica-toggle-plugin-header");
- toggle_plugin.setAttribute("id",
- "linterna-magica-toggle-plugin-header-"+id);
- }
-
- if (/html5/i.test(switch_type))
- {
- var title = this.
- _("Switch between site's HTML5 player and Linterna Mágica");
-
- toggle_plugin.setAttribute("title", title);
- }
- else
- {
- var flash_mime_type =
navigator.mimeTypes['application/x-shockwave-flash'];
- var flash_plugin = flash_mime_type.enabledPlugin ?
- flash_mime_type.enabledPlugin.filename : '';
-
- // TRANSLATORS: The tooltip for the buttons that switch
- // between LM and a flash plugin.
- var title = this.
- _("Switch between flash plugin and Linterna Mágica");
-
-
- if (/gnash/i.test(flash_plugin))
- {
- // TRANSLATORS: The tooltip for the buttons that switch
- // between LM and a flash plugin.
- title = this.
- _("Switch between the Gnash plugin for flash and Linterna
Mágica");
- }
- else if (/lightspark/i.test(flash_plugin))
- {
- // TRANSLATORS: The tooltip for the buttons that switch
- // between LM and a flash plugin.
- title = this.
- _("Switch between the Lightspark plugin for flash and Linterna
Mágica");
- }
- else if (/totem-vegas/i.test(flash_plugin))
- {
- // TRANSLATORS: The tooltip for the buttons that switch
- // between LM and a flash plugin.
- title = this.
- _("Switch between the Totem Vegas plugin for flash and Linterna
Mágica");
- }
-
-
- toggle_plugin.setAttribute("title",title);
- }
-
- return wrapper ? wrapper : toggle_plugin;
-}
-
-// Event listener function that switches between flash plugin or HTML5
-// player and Linterna Mágica
-LinternaMagica.prototype.toggle_plugin = function(event,element)
-{
- event.preventDefault();
-
- // for the header link
- // element->header->container_div->object
- // for the external link
- // element->p->div_with_object->object
-
- var linterna_magica_id = element.getAttribute("id");
- linterna_magica_id = linterna_magica_id.split("-");
- linterna_magica_id = linterna_magica_id[linterna_magica_id.length-1];
-
- var lm_interface =
- document.getElementById("linterna-magica-"+linterna_magica_id);
-
- if (!lm_interface)
- {
- return null;
- }
-
- var html5_parent = null;
-
- var site_player =
- this.get_flash_video_object(linterna_magica_id,
- // The parent of the div holding
- // Linterna Mágica
- lm_interface.parentNode);
- if (!site_player)
- {
- html5_parent = lm_interface.parentNode;
- site_player =
- this.find_site_html5_player_wrapper(html5_parent);
-
- if (!site_player)
- {
- return null;
- }
- }
-
- // Visible flash, hidden video object. Display has value (none)
- // when the object is hidden.
- if (!site_player.style.getPropertyValue("display") &&
- lm_interface.style.getPropertyValue("display"))
- {
- this.log("LinternaMagica.toggle_plugin:\n"+
- "Replacing/hiding swf object (id:"+
- linterna_magica_id+
- ") with video object.", 4);
-
- if (!html5_parent)
- {
- this.hide_flash_video_object(linterna_magica_id,
- site_player.parentNode);
- }
- else
- {
- this.pause_site_html5_player(html5_parent);
- this.hide_site_html5_player(html5_parent);
- }
-
- this.show_lm_interface(linterna_magica_id);
-
- // Init the web controls
- if (this.controls)
- {
- this.player.init.apply(this,[linterna_magica_id]);
- }
-
- // Hide the external toggle plugin link
- var ext_toggle_wrapper = lm_interface.nextSibling;
- ext_toggle_wrapper.style.setProperty("display", "none", "important");
- }
- // Hidden flash, visible video object. Display has value (none)
- // when the object is hidden.
- else if (!lm_interface.style.getPropertyValue("display") &&
- site_player.style.getPropertyValue("display"))
- {
- this.log("LinternaMagica.toggle_plugin:\n"+
- "Replacing/hiding video object (id:"+
- linterna_magica_id+
- ") with swf object.", 4);
-
- if (!html5_parent)
- {
- this.show_flash_video_object(linterna_magica_id,
- site_player.parentNode);
-
- }
- else
- {
- this.show_site_html5_player(html5_parent);
- }
-
- var about = document.getElementById("linterna-magica-about-box-"+
- linterna_magica_id);
-
- var update_info =
- document.getElementById("linterna-magica-update-info-box-"+
- linterna_magica_id);
-
- if (about && !about.style.display)
- {
- this.about(null, about);
- }
-
- if (update_info && !update_info.style.display)
- {
- this.show_or_hide_update_info(null, update_info);
- }
-
- this.hide_lm_interface(linterna_magica_id);
-
- // External toggle plugin link
- var ext_toggle_wrapper = lm_interface.nextSibling;
- ext_toggle_wrapper.style.removeProperty("display");
- }
-}
Modified: trunk/src/lm_site_dailymotion.js
===================================================================
--- trunk/src/lm_site_dailymotion.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_site_dailymotion.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -3,7 +3,7 @@
//
// This file is part of Linterna Mágica
//
-// Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
+// Copyright (C) 2010, 2011, 2012, 2013 Ivaylo Valkov <address@hidden>
// Copyright (C) 2010 Anton Katsarov <address@hidden>
//
// The JavaScript code in this page (or file) is free software: you
@@ -278,44 +278,6 @@
{
html5_error.style.setProperty("display", "none", "important");
}
-
- // Hide / show on toggle_plugin clicks
- var toggle_header =
- document.getElementById("linterna-magica-toggle-plugin-header-"+
- object_data.linterna_magica_id);
- var toggle_after =
- document.getElementById("linterna-magica-toggle-plugin-"+
- object_data.linterna_magica_id);
-
- var header_fn = function(ev)
- {
- var err_screen = document.querySelector(".error_screen");
-
- if (!err_screen)
- {
- return;
- }
-
- if (err_screen.style.display)
- {
- err_screen.style.removeProperty("display");
- }
- else
- {
- err_screen.style.setProperty("display",
- "none", "important");
- }
- };
-
- if (toggle_header)
- {
- toggle_header.addEventListener("click",header_fn,false);
- }
-
- if (toggle_after)
- {
- toggle_after.addEventListener("click",header_fn,false);
- }
}
return null;
Modified: trunk/src/lm_site_indieflixcom.js
===================================================================
--- trunk/src/lm_site_indieflixcom.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_site_indieflixcom.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -3,7 +3,7 @@
//
// This file is part of Linterna Mágica
//
-// Copyright (C) 2011, 2012 Ivaylo Valkov <address@hidden>
+// Copyright (C) 2011, 2012, 2013 Ivaylo Valkov <address@hidden>
//
// The JavaScript code in this page (or file) is free software: you
// can redistribute it and/or modify it under the terms of the GNU
@@ -52,18 +52,7 @@
function(object_data)
{
var id = object_data.linterna_magica_id;
- var toggle_plugin =
- document.getElementById("linterna-magica-toggle-plugin-"+id);
- if (toggle_plugin)
- {
- // Move the external toggle plugin link at the bottom of the
- // player.
- var p = toggle_plugin.parentNode;
- p.style.setProperty("top", (parseInt(object_data.height)+5)+"px",
- "importnat");
- }
-
// Fix hidden HD links menu
var lm = document.getElementById("linterna-magica-"+id);
var central_player = lm.parentNode.parentNode;
Modified: trunk/src/lm_site_vimeo.js
===================================================================
--- trunk/src/lm_site_vimeo.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_site_vimeo.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -3,7 +3,7 @@
//
// This file is part of Linterna Mágica
//
-// Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
+// Copyright (C) 2010, 2011, 2012 Ivaylo Valkov <address@hidden>
// Copyright (C) 2010 Anton Katsarov <address@hidden>
//
// The JavaScript code in this page (or file) is free software: you
Modified: trunk/src/lm_site_youtube.js
===================================================================
--- trunk/src/lm_site_youtube.js 2013-05-01 10:07:38 UTC (rev 401)
+++ trunk/src/lm_site_youtube.js 2013-05-06 14:37:53 UTC (rev 402)
@@ -508,10 +508,7 @@
movie_player.linterna_magica_id = object_data.linterna_magica_id;
}
- if (this.priority.self > this.priority.plugin)
- {
- this.hide_flash_video_object(object_data.linterna_magica_id);
- }
+ this.hide_flash_video_object(object_data.linterna_magica_id);
if (document.getElementById("playnav-playview"))
{
@@ -615,36 +612,7 @@
// will not be displaced.
html5_wrapper.style.setProperty('display', "none", "important");
- // If the HTML5 player has a fallback CSS class and LM can
- // access it it means there is no other option for
- // playback. We take over the player.
- //
- // See bug 37630
- // https://savannah.nongnu.org/bugs/index.php?37630
- if (this.priority.html5 > this.priority.self)
- {
- // It should be available, because it is used above in
- // this function
- var id = object_data.linterna_magica_id;
-
- this.show_lm_interface(id);
-
- // It should be available, because it is used above in
- // this functon.
- toggle_plugin =
- document.getElementById("linterna-magica-"+
- "toggle-plugin-"+id);
-
- var pn = toggle_plugin.parentNode.parentNode;
- pn.removeChild(toggle_plugin.parentNode);
-
- toggle_plugin_header =
- document.getElementById("linterna-magica-"+
- "toggle-plugin-header-"+id);
-
-
toggle_plugin_header.parentNode.removeChild(toggle_plugin_header);
- }
-
+
// Hide site controls and video container. Should not
// overlap with Linterna Magica now. Fixes the overlapping
// of HTML5 player and LM.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [linterna-magica-commit] [402] Switching between HTMl5, Flash and Linterna Magica is derecated.,
Ivaylo Valkov <=