Use Activerecord '#or' method for queries

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

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index b670bd28925249566a75308b9a735d3f00cf0dcc..a6213b9c434367a9141062be608e1a2b53d49bf0 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -1,23 +1,22 @@
 OSM.Changeset = function (map) {
   var page = {},
 OSM.Changeset = function (map) {
   var page = {},

-    content = $("#sidebar_content"),
-    currentChangesetId;
+      content = $("#sidebar_content"),
+      currentChangesetId;

 
 

-  page.pushstate = page.popstate = function(path, id) {
-    OSM.loadSidebarContent(path, function() {
+  page.pushstate = page.popstate = function (path, id) {
+    OSM.loadSidebarContent(path, function () {

       page.load(path, id);
     });
   };
 
       page.load(path, id);
     });
   };
 

-  page.load = function(path, id) {
-    if (id)
-      currentChangesetId = id;
+  page.load = function (path, id) {
+    if (id) currentChangesetId = id;

     initialize();
     addChangeset(currentChangesetId, true);
   };
 
   function addChangeset(id, center) {
     initialize();
     addChangeset(currentChangesetId, true);
   };
 
   function addChangeset(id, center) {

-    map.addObject({type: "changeset", id: parseInt(id, 10)}, function(bounds) {
+    map.addObject({ type: "changeset", id: parseInt(id, 10) }, function (bounds) {

       if (!window.location.hash && bounds.isValid() &&
           (center || !map.getBounds().contains(bounds))) {
         OSM.router.withoutMoveListener(function () {
       if (!window.location.hash && bounds.isValid() &&
           (center || !map.getBounds().contains(bounds))) {
         OSM.router.withoutMoveListener(function () {


@@ -30,10 +29,11 @@ OSM.Changeset = function (map) {
   function updateChangeset(form, method, url, include_data) {
     var data;
 
   function updateChangeset(form, method, url, include_data) {
     var data;
 

+    $(form).find("#comment-error").prop("hidden", true);

     $(form).find("input[type=submit]").prop("disabled", true);
 
     if (include_data) {
     $(form).find("input[type=submit]").prop("disabled", true);
 
     if (include_data) {

-      data = {text: $(form.text).val()};
+      data = { text: $(form.text).val() };

     } else {
       data = {};
     }
     } else {
       data = {};
     }


@@ -45,6 +45,11 @@ OSM.Changeset = function (map) {
       data: data,
       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);
       data: data,
       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);

+      },
+      error: function (xhr, xhr_status, http_status) {
+        $(form).find("#comment-error").text(http_status);
+        $(form).find("#comment-error").prop("hidden", false);
+        $(form).find("input[type=submit]").prop("disabled", false);

       }
     });
   }
       }
     });
   }


@@ -75,7 +80,7 @@ OSM.Changeset = function (map) {
     content.find("textarea").val("").trigger("input");
   }
 
     content.find("textarea").val("").trigger("input");
   }
 

-  page.unload = function() {
+  page.unload = function () {

     map.removeObject();
   };
 
     map.removeObject();
   };