Only set QT_QPA_PLATFORM if phantomjs fails without it

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index b30564a1ae64b12ee3c7a98aff01b1c131da8c26..ccf4e561c98ceacd14d0e612f77e408fc6bac734 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -20,6 +20,7 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

+//= require bowser

 
 $(document).ready(function () {
   var loaderTimeout;
 
 $(document).ready(function () {
   var loaderTimeout;


@@ -114,6 +115,7 @@ $(document).ready(function () {
     .removeClass('leaflet-control-locate leaflet-bar')
     .addClass('control-locate')
     .children("a")
     .removeClass('leaflet-control-locate leaflet-bar')
     .addClass('control-locate')
     .children("a")

+    .attr('href', '#')

     .removeClass('leaflet-bar-part leaflet-bar-part-single')
     .addClass('control-button');
 
     .removeClass('leaflet-bar-part leaflet-bar-part-single')
     .addClass('control-button');
 


@@ -240,9 +242,7 @@ $(document).ready(function () {
 
   function remoteEditHandler(bbox, object) {
     var loaded = false,
 
   function remoteEditHandler(bbox, object) {
     var loaded = false,

-        url = document.location.protocol === "https:" ?
-        "https://127.0.0.1:8112/load_and_zoom?" :
-        "http://127.0.0.1:8111/load_and_zoom?",
+        url,

         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,


@@ -250,6 +250,13 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
           bottom: bbox.getSouth() - 0.0001
         };
 

+    if (location.protocol === 'http' ||
+        bowser.check({chrome: "53", firefox: "55"})) {
+      url = "http://127.0.0.1:8111/load_and_zoom?";
+    } else {
+      url = "https://127.0.0.1:8112/load_and_zoom?";
+    }
+

     if (object) query.select = object.type + object.id;
 
     var iframe = $('<iframe>')
     if (object) query.select = object.type + object.id;
 
     var iframe = $('<iframe>')