FireFox Review

LeonardoCiaccio · Oct 30, 2017 · a6f6cdd · a6f6cdd
1 parent 30c8b49
commit a6f6cdd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/Extension/manifest.json b/Extension/manifest.json
@@ -2,7 +2,7 @@
 
 	"manifest_version" 			: 2,
 	"author"					: "Leonardo Ciaccio",
-	"version" 					: "6.1.7.3",
+	"version" 					: "6.1.7.6",
 	"name" 						: "Grab Any Media",
 	"default_locale" 			: "en",
 	"description" 				: "__MSG_des__",

diff --git a/Extension/module/dailymotion.js b/Extension/module/dailymotion.js
@@ -15,9 +15,7 @@
     "use strict";
 
     var
-         externalAPI = "https://www.10convert.com/watch?v={%c}&utm_source=GrabAnyMedia&utm_medium=extension"
-
-        ,api = "http://www.dailymotion.com/player/metadata/video/{%c}"
+         api = "http://www.dailymotion.com/player/metadata/video/{%c}"
 
         ,_noCache = function( link ){
 
@@ -140,9 +138,9 @@
         ,_getVideoCode = function( link ){
 
             var 
-                 reCanonical = /^(https\:\/\/|http\:\/\/|\/\/).*dailymotion\..*\/video\/:?/gi
+                 reCanonical = /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?dailymotion\..*\/video\/:?/gi
 
-                ,reEmbed     = /^(https\:\/\/|http\:\/\/|\/\/).*dailymotion\..*\/embed\/video\/:?/gi
+                ,reEmbed     = /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?dailymotion\..*\/embed\/video\/:?/gi
 
                 ,tmp
             ;
@@ -249,7 +247,7 @@
 
             _findLinks( videocode, function( response ){
 
-                if( !response || response.length < 1 )return callback(); //return callback( externalAPI.replace( /\{\%c\}/gi, videocode ) );
+                if( !response || response.length < 1 )return callback();
 
                 return callback( response );
 

diff --git a/Extension/module/facebook.js b/Extension/module/facebook.js
@@ -15,9 +15,7 @@
     "use strict";
 
     var
-         externalAPI = "https://www.10convert.com/watch?v={%c}&utm_source=GrabAnyMedia&utm_medium=extension"
-
-        ,_toDownload = function( newpage, link, title ){
+         _toDownload = function( newpage, link, title ){
 
             if( newpage ){
 
@@ -313,10 +311,10 @@
                 }
 
             }
-
-            if( !link.match( /^(https\:\/\/|http\:\/\/|\/\/).*facebook\..*\/.*\/videos\/:?/gi )/* &&
+            			
+            if( !link.match( /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?facebook\..*\/.*\/videos\/:?/gi )/* &&
               
-                !link.match( /^(https\:\/\/|http\:\/\/|\/\/).*facebook\..*\/plugins\/video.php:?/gi )
+                !link.match( /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?facebook\..*\/plugins\/video.php:?/gi )
               */){
 
                 alert( chrome.i18n.getMessage( "fb_to_video" ) );
@@ -327,7 +325,7 @@
 
             _findLinks( link, function( response ){
 
-                if( !response || response.length < 1 )return callback(); //return callback( externalAPI.replace( /\{\%c\}/gi, videocode ) );
+                if( !response || response.length < 1 )return callback();
 
                 return callback( response );
 

diff --git a/Extension/module/vimeo.js b/Extension/module/vimeo.js
@@ -15,9 +15,7 @@
     "use strict";
 
     var
-         externalAPI = "https://www.10convert.com/watch?v={%c}&utm_source=GrabAnyMedia&utm_medium=extension"
-
-        ,api = "https://player.vimeo.com/video/{%c}/config"
+         api = "https://player.vimeo.com/video/{%c}/config"
 
         ,_noCache = function( link ){
 
@@ -140,9 +138,9 @@
         ,_getVideoCode = function( link ){
 
             var 
-                 reCanonical = /^(https\:\/\/|http\:\/\/|\/\/).*vimeo\..*\/:?/gi
+                 reCanonical = /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?vimeo\..*\/:?/gi
 
-                ,reEmbed     = /^(https\:\/\/|http\:\/\/|\/\/).*vimeo\..*\/video\/:?/gi
+                ,reEmbed     = /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?vimeo\..*\/video\/:?/gi
 
                 ,tmp
             ;
@@ -233,7 +231,7 @@
 
             _findLinks( videocode, function( response ){
 
-                if( !response || response.length < 1 )return callback(); //return callback( externalAPI.replace( /\{\%c\}/gi, videocode ) );
+                if( !response || response.length < 1 )return callback();
 
                 return callback( response );
 

diff --git a/Extension/module/youtube.js b/Extension/module/youtube.js
@@ -161,9 +161,9 @@
         ,_getVideoCode = function( link ){
 
             var
-                 reCanonical = /^(https\:\/\/|http\:\/\/|\/\/).*youtube\..*\/watch\?:?/gi
+                 reCanonical = /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?youtube\..*\/watch\?:?/gi
 
-                ,reEmbed     = /^(https\:\/\/|http\:\/\/|\/\/).*youtube\..*\/embed\/:?/gi
+                ,reEmbed     = /^(https\:\/\/|http\:\/\/|\/\/)(?:www\.)?youtube\..*\/embed\/:?/gi
             ;
 
             if( link.match( reCanonical ) ){