Merge pull request #1607 from geoadmin/gjn_cookieless_printing

Use CORS for print as well
geoadmin · Aug 26, 2014 · 8095a45 · 8095a45
2 parents 5d25b1a + ef17585
commit 8095a45
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/apache/app.mako-dot-conf b/apache/app.mako-dot-conf
@@ -43,13 +43,6 @@ RewriteRule ^${apache_base_path}/sitemap_(.*)\.xml http:${api_url}/${version}/si
     Header merge Cache-Control "no-cache"
 </LocationMatch>
 
-# Proxy definitions
-ProxyPassMatch ^${apache_base_path}/print/(.*) http:${api_url}/print/$1
-<LocationMatch ^${apache_base_path}/print>
-    Order allow,deny
-    Allow from all
-</LocationMatch>
-
 # Checker definitions (never cache)
 <Location ~ "${apache_base_path}/checker$">
     ExpiresDefault "access"

diff --git a/src/index.mako.html b/src/index.mako.html
@@ -613,7 +613,6 @@ <h3 class="popover-title">
         var pathname = location.pathname.replace(/(index.html)|(mobile.html)/g, '');
 
         module.constant('gaGlobalOptions', {
-          mapUrl : location.origin + '${apache_base_path}',
           apiUrl : location.protocol + '${api_url}',
           cachedApiUrl: location.protocol + '${api_url}' + cacheAdd,
           resourceUrl: location.origin + pathname + '${versionslashed}',

diff --git a/src/js/PrintController.js b/src/js/PrintController.js
@@ -5,7 +5,7 @@
 
   module.controller('GaPrintController',
     function($scope, gaGlobalOptions) {
-      var printPath = gaGlobalOptions.mapUrl + '/print'
+      var printPath = gaGlobalOptions.apiUrl + '/print'
 
       $scope.options = {
         printConfigUrl: printPath + '/info.json?url=' +