[linterna-magica-commit] [392] Merging r390 and r391 from trunk to stable branch

[Ivaylo Valkov]

Revision: 392
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=392
Author:   valkov
Date:     2013-02-17 11:15:10 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Merging r390 and r391 from trunk to stable branch

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=390
    http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=391

Modified Paths:
--------------
    branches/0.0.13/src/lm_site_youtube.js
    branches/0.0.13/src/lm_userscript_header.txt

Property Changed:
----------------
    branches/0.0.13/


Property changes on: branches/0.0.13
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.0.9:94
/branches/task-11216:102-156
   + /branches/0.0.9:94
/branches/task-11216:102-156
/trunk:390-391

Modified: branches/0.0.13/src/lm_site_youtube.js
===================================================================
--- branches/0.0.13/src/lm_site_youtube.js      2013-02-17 11:09:40 UTC (rev 
391)
+++ branches/0.0.13/src/lm_site_youtube.js      2013-02-17 11:15:10 UTC (rev 
392)
@@ -353,8 +353,7 @@
 function()
 {
     var data = this.script_data;
-    if (!data.match(/var\s*swfConfig/) &&
-       !data.match(/yt\.setConfig/))
+    if (!data.match(/yt\.playerConfig =/))
     {
        return null;
     }

Modified: branches/0.0.13/src/lm_userscript_header.txt
===================================================================
--- branches/0.0.13/src/lm_userscript_header.txt        2013-02-17 11:09:40 UTC 
(rev 391)
+++ branches/0.0.13/src/lm_userscript_header.txt        2013-02-17 11:15:10 UTC 
(rev 392)
@@ -33,7 +33,7 @@
 //  plugin (totem/vlc/xine/gecko-mediaplayer).
 
 // ==UserScript==
-// @name          Linterna Mágica
+// @name          Linterna Mágica @VERSION@
 // @namespace Linterna Mágica
 // @description  Watch video on the web in a brand new way: You don't need a 
glint, the magic lantern is ignited!
 // @include        http://*