Merge pull request #21 from diogoriba/master

adding flags for compatibility w/ full https websites
Urigo · Nov 30, 2014 · 9cdb314 · 9cdb314
2 parents da5bb4e + ecf4da9
commit 9cdb314
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/angular-embedly.js b/angular-embedly.js
@@ -10,18 +10,29 @@ var angularEmbedly = angular.module('angular-embedly', []);
 (function (module) {
     module.provider('embedlyService', function () {
         var key;
+        var secure;
         this.setKey = function(userKey) {
             key = userKey;
             return key;
         }
         this.getKey = function() {
             return key;
         }
+        this.secure = function(value) {
+            if (!value) {
+                return secure;
+            }
+            secure = value;
+        }
+
+        function getProtocol() {
+            return secure ? 'https' : 'https' ;
+        }
 
         function embedly($http) {
             this.embed = function(inputUrl, maxwidth) {
                 var escapedUrl = encodeURI(inputUrl);
-                var embedlyRequest = 'http://api.embed.ly/1/oembed?key=' + key + '&url=' +  escapedUrl;
+                var embedlyRequest = getProtocol() + '://api.embed.ly/1/oembed?key=' + key + '&url=' +  escapedUrl;
 
                 if(typeof maxwidth !== 'undefined'){
                     embedlyRequest = embedlyRequest + '&maxwidth=' + maxwidth;
@@ -31,7 +42,7 @@ var angularEmbedly = angular.module('angular-embedly', []);
             };
             this.extract = function(inputUrl) {
                 var escapedUrl = encodeURI(inputUrl);
-                var embedlyRequest = 'http://api.embed.ly/1/extract?key=' + key + '&url=' +  escapedUrl;
+                var embedlyRequest = getProtocol + '://api.embed.ly/1/extract?key=' + key + '&url=' +  escapedUrl;
                 return $http({method: 'GET', url: embedlyRequest});
             };
         }

diff --git a/em-minified/angular-embedly.min.js b/em-minified/angular-embedly.min.js
diff --git a/src/services/embedlyService.js b/src/services/embedlyService.js
@@ -5,18 +5,29 @@
 (function (module) {
     module.provider('embedlyService', function () {
         var key;
+        var secure;
         this.setKey = function(userKey) {
             key = userKey;
             return key;
         }
         this.getKey = function() {
             return key;
         }
+        this.secure = function(value) {
+            if (!value) {
+                return secure;
+            }
+            secure = value;
+        }
+
+        function getProtocol() {
+            return secure ? 'https' : 'https' ;
+        }
 
         function embedly($http) {
             this.embed = function(inputUrl, maxwidth) {
                 var escapedUrl = encodeURI(inputUrl);
-                var embedlyRequest = 'http://api.embed.ly/1/oembed?key=' + key + '&url=' +  escapedUrl;
+                var embedlyRequest = getProtocol() + '://api.embed.ly/1/oembed?key=' + key + '&url=' +  escapedUrl;
 
                 if(typeof maxwidth !== 'undefined'){
                     embedlyRequest = embedlyRequest + '&maxwidth=' + maxwidth;
@@ -26,7 +37,7 @@
             };
             this.extract = function(inputUrl) {
                 var escapedUrl = encodeURI(inputUrl);
-                var embedlyRequest = 'http://api.embed.ly/1/extract?key=' + key + '&url=' +  escapedUrl;
+                var embedlyRequest = getProtocol + '://api.embed.ly/1/extract?key=' + key + '&url=' +  escapedUrl;
                 return $http({method: 'GET', url: embedlyRequest});
             };
         }