Merge pull request #1660 from geoadmin/gal_shorten_cors

Use cors to shorten URLs (and fix CORS hack)
geoadmin · Sep 18, 2014 · fcaa529 · fcaa529
2 parents 275fd8d + ed63029
commit fcaa529
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/src/components/print/PrintDirective.js b/src/components/print/PrintDirective.js
@@ -624,7 +624,7 @@
         return parseInt(scale.value);
       });
       var that = this;
-      $http.jsonp($scope.options.shortenUrl, {
+      $http.get($scope.options.shortenUrl, {
         params: {
           url: gaPermalink.getHref()
         }

diff --git a/src/components/share/ShareDirective.js b/src/components/share/ShareDirective.js
@@ -2,24 +2,21 @@
   goog.provide('ga_share_directive');
 
   goog.require('ga_permalink');
-  goog.require('ga_urlutils_service');
 
   var module = angular.module('ga_share_directive', [
-    'ga_permalink',
-    'ga_urlutils_service'
+    'ga_permalink'
   ]);
 
   module.directive('gaShare',
-      function($http, $window, gaPermalink, gaUrlUtils) {
+      function($http, $window, gaPermalink) {
           return {
             restrict: 'A',
             scope: {
               options: '=gaShareOptions'
             },
             templateUrl: 'components/share/partials/share.html',
             link: function(scope, element, attrs) {
-              var shortenUrl = gaUrlUtils.append(scope.options.shortenUrl,
-                  'cb=JSON_CALLBACK');
+              var shortenUrl = scope.options.shortenUrl;
               scope.qrcodegeneratorPath = scope.options.qrcodegeneratorPath;
 
               $('.ga-share-icon').tooltip({
@@ -58,7 +55,7 @@
               // Function to shorten url
               // Make an asynchronous request to url shortener
               scope.shortenUrl = function() {
-                $http.jsonp(shortenUrl, {
+                $http.get(shortenUrl, {
                   params: {
                     url: scope.permalinkValue
                   }

diff --git a/src/js/PrintController.js b/src/js/PrintController.js
@@ -13,7 +13,7 @@
             encodeURIComponent(printPath),
         legendUrl: gaGlobalOptions.apiUrl + '/static/images/legends/',
         qrcodeUrl: gaGlobalOptions.apiUrl + '/qrcodegenerator?url=',
-        shortenUrl: gaGlobalOptions.apiUrl + '/shorten.json?cb=JSON_CALLBACK',
+        shortenUrl: gaGlobalOptions.apiUrl + '/shorten.json',
         markerUrl: gaGlobalOptions.resourceUrl + 'img/marker.png',
         heightMargin: $('#header').height(),
         widthMargin: $('#pulldown').width(),

diff --git a/src/lib/angularIE9CorsFix.js b/src/lib/angularIE9CorsFix.js