Remove pan and zoom controls

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 0f0b2fa10c1420d1abb6c093e1c36f8a66dd824b..b9d09bd82e1921643c94a92c0802434080cd46dd 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,18 +1,21 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery
 //= require jquery_ujs

-//= require jquery.autogrowtextarea

 //= require jquery.timers
 //= require jquery.timers

+//= require jquery.cookie

 //= require augment
 //= require augment

-//= require openlayers
+//= require leaflet
+//= require leaflet.osm
+//= require leaflet.locationfilter

 //= require i18n/translations
 //= require i18n/translations

-//= require globals
+//= require oauth
+//= require osm

 //= require piwik
 //= require piwik

-//= require browse
-//= require export

 //= require map
 //= require map

-//= require key

 //= require menu
 //= require sidebar
 //= require menu
 //= require sidebar

+//= require richtext
+//= require resize
+//= require geocoder

 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));
 
 function zoomPrecision(zoom) {
     var decimals = Math.pow(10, Math.floor(zoom/3));


@@ -25,7 +28,7 @@ function zoomPrecision(zoom) {
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
  */
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
  */

-function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) {
+function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) {

   var toPrecision = zoomPrecision(zoom);
   var node;
 
   var toPrecision = zoomPrecision(zoom);
   var node;
 


@@ -54,8 +57,8 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       args.layers = layers;
     }
 
       args.layers = layers;
     }
 

-    if (objtype && $(link).hasClass("object")) {
-      args[objtype] = objid;
+    if (object && $(link).hasClass("object")) {
+      args[object.type] = object.id;

     }
 
     var minzoom = $(link).data("minzoom");
     }
 
     var minzoom = $(link).data("minzoom");


@@ -83,8 +86,8 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     var prefix = shortlinkPrefix();
 
     // Add ?{node,way,relation}=id to the arguments
     var prefix = shortlinkPrefix();
 
     // Add ?{node,way,relation}=id to the arguments

-    if (objtype && objid) {
-      args[objtype] = objid;
+    if (object) {
+      args[object.type] = object.id;

     }
 
     // This is a hack to omit the default mapnik layer from the shortlink.
     }
 
     // This is a hack to omit the default mapnik layer from the shortlink.


@@ -99,7 +102,7 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     // ?{node,way,relation}= can be safely omitted from the shortlink
     // which encodes lat/lon/zoom. If new URL parameters are added to
     // the main slippy map this needs to be changed.
     // ?{node,way,relation}= can be safely omitted from the shortlink
     // which encodes lat/lon/zoom. If new URL parameters are added to
     // the main slippy map this needs to be changed.

-    if (args.layers || args[objtype]) {
+    if (args.layers || object) {

       this.href = setArgs(prefix + "/go/" + code, args);
     } else {
       this.href = prefix + "/go/" + code;
       this.href = setArgs(prefix + "/go/" + code, args);
     } else {
       this.href = prefix + "/go/" + code;


@@ -201,67 +204,6 @@ function makeShortCode(lat, lon, zoom) {
     return str;
 }
 
     return str;
 }
 

-/*
- * Click handler to switch a rich text control to preview mode
- */
-function previewRichtext(event) {
-  var editor = $(this).parents(".richtext_container").find("textarea");
-  var preview = $(this).parents(".richtext_container").find(".richtext_preview");
-  var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth();
-  var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight();
-
-  if (preview.contents().length == 0) {
-    preview.oneTime(500, "loading", function () {
-      preview.addClass("loading");
-    });
-
-    preview.load(editor.attr("data-preview-url"), { text: editor.val() }, function () {
-      preview.stopTime("loading");
-      preview.removeClass("loading");
-    });
-  }
-
-  editor.hide();
-  preview.width(width);
-  preview.css("min-height", minHeight + "px");
-  preview.show();
-
-  $(this).siblings(".richtext_doedit").prop("disabled", false);
-  $(this).prop("disabled", true);
-
-  event.preventDefault();
-}
-
-/*
- * Click handler to switch a rich text control to edit mode
- */
-function editRichtext(event) {
-  var editor = $(this).parents(".richtext_container").find("textarea");
-  var preview = $(this).parents(".richtext_container").find(".richtext_preview");
-
-  preview.hide();
-  editor.show();
-
-  $(this).siblings(".richtext_dopreview").prop("disabled", false);
-  $(this).prop("disabled", true);
-
-  event.preventDefault();
-}
-
-/*
- * Setup any rich text controls
- */
-$(document).ready(function () {
-  $(".richtext_preview").hide();
-  $(".richtext_content textarea").change(function () { 
-    $(this).parents(".richtext_container").find(".richtext_preview").empty();
-  });
-  $(".richtext_doedit").prop("disabled", true);
-  $(".richtext_dopreview").prop("disabled", false);
-  $(".richtext_doedit").click(editRichtext);
-  $(".richtext_dopreview").click(previewRichtext);
-});
-

 /*
  * Forms which have been cached by rails may have he wrong
  * authenticity token, so patch up any forms with the correct
 /*
  * Forms which have been cached by rails may have he wrong
  * authenticity token, so patch up any forms with the correct


@@ -271,10 +213,3 @@ $(document).ready(function () {
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 });
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 });

-
-/*
- * Enable auto expansion for all text areas
- */
-$(document).ready(function () {
-  $("textarea").autoGrow();
-});