Use ejs templates in browse JS

diff --git a/Gemfile b/Gemfile
index bca398229adf6a333369e6721e5543b1a4ab429a..fa3f38d799818517c03447e19a8ba1c4f53b42bc 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -63,4 +63,5 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'therubyracer'
+  gem 'ejs'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
index d571f26f6990bd8cedfde43a5e60cb10c0313182..8c8e60af7ce43126d36d208cda8814c7bcee7758 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,6 +44,7 @@ GEM
       activerecord (~> 3.2.0, >= 3.2.8)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
+    ejs (1.1.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -166,6 +167,7 @@ DEPENDENCIES
   composite_primary_keys (>= 5.0.9)
   deadlock_retry (>= 1.2.0)
   dynamic_form
+  ejs
   htmlentities
   http_accept_language (>= 1.0.2)
   httpclient

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 4f3351a76f56a3f88eeff92cbd87172c9c28b06a..1792c8577f5b250ed547791f8c6bc32eea18dbb1 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,3 +1,7 @@
+//= require templates/browse/feature
+//= require templates/browse/feature_list
+//= require templates/browse/feature_history
+
 $(document).ready(function () {
   $("#show_data").click(function (e) {
     $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
@@ -284,67 +288,47 @@ $(document).ready(function () {
       if (this.map.dataLayer.active) {
         clearStatus();
 
-        browseObjectList = document.createElement("div");
-
-        var heading = document.createElement("p");
-        heading.className = "browse_heading";
-        heading.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.heading')));
-        browseObjectList.appendChild(heading);
-
-        var list = document.createElement("ul");
-
+        var features = [];
         for (var i = 0; i < this.features.length; i++) {
           var feature = this.features[i];
-
-          // Type, for linking
-          var type = featureType(feature);
-          var typeName = featureTypeName(feature);
-          var li = document.createElement("li");
-          li.appendChild(document.createTextNode(typeName + " "));
-
-          // Link, for viewing in the tab
-          var link = document.createElement("a");
-          link.href =  "/browse/" + type + "/" + feature.osm_id;
-          var name = featureName(feature);
-          link.appendChild(document.createTextNode(name));
-          link.feature = feature;
-          link.onclick = OpenLayers.Function.bind(viewFeatureLink, link);
-          li.appendChild(link);
-
-          list.appendChild(li);
+          features.push({
+            typeName: featureTypeName(feature),
+            url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
+            name: featureName(feature),
+            id: feature.id
+          });
         }
 
-        browseObjectList.appendChild(list);
-
-        var link = document.createElement("a");
-        link.href = this.protocol.url;
-        link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.api')));
-        browseObjectList.appendChild(link);
+        browseObjectList = $(JST["templates/browse/feature_list"]({
+          features: features,
+          url: this.protocol.url
+        }))[0];
 
-        $("#browse_content").html(browseObjectList);
+        loadObjectList();
       }
     }
 
     function viewFeatureLink() {
-      var layer = this.feature.layer;
+      var feature = browseDataLayer.getFeatureById($(this).data("feature-id"));
+      var layer = feature.layer;
 
       for (var i = 0; i < layer.selectedFeatures.length; i++) {
         var f = layer.selectedFeatures[i];
         layer.drawFeature(f, layer.styleMap.createSymbolizer(f, "default"));
       }
 
-      onFeatureSelect(this.feature);
+      onFeatureSelect(feature);
 
       if (browseMode != "auto") {
-        map.setCenter(this.feature.geometry.getBounds().getCenterLonLat());
+        map.setCenter(feature.geometry.getBounds().getCenterLonLat());
       }
 
       return false;
     }
 
     function loadObjectList() {
-      $("#browse_content").empty();
-      $("#browse_content").append(browseObjectList);
+      $("#browse_content").html(browseObjectList);
+      $("#browse_content").find("a[data-feature-id]").click(viewFeatureLink);
 
       return false;
     }
@@ -370,126 +354,51 @@ $(document).ready(function () {
         $("#browse_content").empty();
       }
 
-      // Create a link back to the object list
-      var div = document.createElement("div");
-      div.style.textAlign = "center";
-      div.style.marginBottom = "20px";
-      $("#browse_content").append(div);
-      var link = document.createElement("a");
-      link.href = "#";
-      link.onclick = loadObjectList;
-      link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.back')));
-      div.appendChild(link);
-
-      var table = document.createElement("table");
-      table.width = "100%";
-      table.className = "browse_heading";
-      $("#browse_content").append(table);
-
-      var tr = document.createElement("tr");
-      table.appendChild(tr);
-
-      var heading = document.createElement("td");
-      heading.appendChild(document.createTextNode(featureNameSelect(feature)));
-      tr.appendChild(heading);
-
-      var td = document.createElement("td");
-      td.align = "right";
-      tr.appendChild(td);
-
-      var type = featureType(feature);
-      var link = document.createElement("a");
-      link.href = "/browse/" + type + "/" + feature.osm_id;
-      link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.object_list.details')));
-      td.appendChild(link);
-
-      var div = document.createElement("div");
-      div.className = "browse_details";
-
-      $("#browse_content").append(div);
-
-      // Now the list of attributes
-      var ul = document.createElement("ul");
-      for (var key in feature.attributes) {
-        var li = document.createElement("li");
-        var b = document.createElement("b");
-        b.appendChild(document.createTextNode(key));
-        li.appendChild(b);
-        li.appendChild(document.createTextNode(": " + feature.attributes[key]));
-        ul.appendChild(li);
-      }
-
-      div.appendChild(ul);
-
-      var link = document.createElement("a");
-      link.href =  "/browse/" + type + "/" + feature.osm_id + "/history";
-      link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.show_history')));
-      link.onclick = OpenLayers.Function.bind(loadHistory, {
-        type: type, feature: feature, link: link
-      });
+      $("#browse_content").html(JST["templates/browse/feature"]({
+        name: featureNameSelect(feature),
+        url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
+        attributes: feature.attributes
+      }));
 
-      div.appendChild(link);
+      $("#browse_content").find("a.browse_show_list").click(loadObjectList);
+      $("#browse_content").find("a.browse_show_history").click(loadHistory);
 
       // Stash the currently drawn feature
       browseActiveFeature = feature;
     }
 
     function loadHistory() {
-      this.link.href = "";
-      this.link.innerHTML = I18n.t('browse.start_rjs.wait');
-
-      $.ajax("/api/" + OSM.API_VERSION + "/" + this.type + "/" + this.feature.osm_id + "/history", {
-        complete: OpenLayers.Function.bind(displayHistory, this)
-      });
-
-      return false;
-    }
-
-    function displayHistory(request) {
-      if (browseActiveFeature.osm_id != this.feature.osm_id || $("#browse_content").firstChild == browseObjectList)  {
-          return false;
-      }
-
-      this.link.parentNode.removeChild(this.link);
+      $(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
 
-      var doc = request.responseXML;
+      var feature = browseActiveFeature;
 
-      var table = document.createElement("table");
-      table.width = "100%";
-      table.className = "browse_heading";
-      $("#browse_content").append(table);
-
-      var tr = document.createElement("tr");
-      table.appendChild(tr);
-
-      var heading = document.createElement("td");
-      heading.appendChild(document.createTextNode(I18n.t("browse.start_rjs.history_for_feature", { feature: featureNameHistory(this.feature) })));
-      tr.appendChild(heading);
+      $.ajax({
+        url: "/api/" + OSM.API_VERSION + "/" + featureType(feature) + "/" + feature.osm_id + "/history",
+        success: function (xml) {
+          if (browseActiveFeature != feature || $("#browse_content").firstChild == browseObjectList) {
+            return;
+          }
 
-      var td = document.createElement("td");
-      td.align = "right";
-      tr.appendChild(td);
+          $(this).remove();
 
-      var link = document.createElement("a");
-      link.href = "/browse/" + this.type + "/" + this.feature.osm_id + "/history";
-      link.appendChild(document.createTextNode(I18n.t('browse.start_rjs.details')));
-      td.appendChild(link);
+          var history = [];
+          var nodes = xml.getElementsByTagName(featureType(feature));
+          for (var i = nodes.length - 1; i >= 0; i--) {
+            history.push({
+              user: nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user'),
+              timestamp: nodes[i].getAttribute("timestamp")
+            });
+          }
 
-      var div = document.createElement("div");
-      div.className = "browse_details";
-
-      var nodes = doc.getElementsByTagName(this.type);
-      var history = document.createElement("ul");
-      for (var i = nodes.length - 1; i >= 0; i--) {
-        var user = nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user');
-        var timestamp = nodes[i].getAttribute("timestamp");
-        var item = document.createElement("li");
-        item.appendChild(document.createTextNode(I18n.t("browse.start_rjs.edited_by_user_at_timestamp", { user: user, timestamp: timestamp })));
-        history.appendChild(item);
-      }
-      div.appendChild(history);
+          $("#browse_content").append(JST["templates/browse/feature_history"]({
+            name: featureNameHistory(feature),
+            url: "/browse/" + featureType(feature) + "/" + feature.osm_id,
+            history: history
+          }));
+        }.bind(this)
+      });
 
-      $("#browse_content").append(div);
+      return false;
     }
 
     function featureType(feature) {

diff --git a/app/assets/javascripts/templates/browse/feature.jst.ejs b/app/assets/javascripts/templates/browse/feature.jst.ejs
new file mode 100644 (file)
index 0000000..5a3fe36
--- /dev/null
+++ b/app/assets/javascripts/templates/browse/feature.jst.ejs
@@ -0,0 +1,19 @@
+<div style="text-align: center; margin-bottom: 20px;">
+  <a href="#" class="browse_show_list"><%- I18n.t('browse.start_rjs.object_list.back') %></a>
+</div>
+<table width="100%" class="browse_heading">
+  <tr>
+    <td><%- name %></td>
+    <td align="right">
+      <a href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.details') %></a>
+    </td>
+  </tr>
+</table>
+<div class="browse_details">
+  <ul>
+    <% for (var key in attributes) { %>
+      <li><b><%- key %></b>: <%- attributes[key] %></li>
+    <% } %>
+  </ul>
+  <a href="<%- url %>/history" class="browse_show_history"><%- I18n.t('browse.start_rjs.show_history') %></a>
+</div>

diff --git a/app/assets/javascripts/templates/browse/feature_history.jst.ejs b/app/assets/javascripts/templates/browse/feature_history.jst.ejs
new file mode 100644 (file)
index 0000000..6f870ac
--- /dev/null
+++ b/app/assets/javascripts/templates/browse/feature_history.jst.ejs
@@ -0,0 +1,15 @@
+<table width="100%" class="browse_heading">
+  <tr>
+    <td><%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %></td>
+    <td align="right">
+      <a href="<%- url %>/history"><%- I18n.t('browse.start_rjs.details') %></a>
+    </td>
+  </tr>
+</table>
+<div class="browse_details">
+  <ul>
+    <% for (var i = 0; i < history.length; i++) { %>
+      <li><%- I18n.t("browse.start_rjs.edited_by_user_at_timestamp", history[i]) %></li>
+    <% } %>
+  </ul>
+</div>

diff --git a/app/assets/javascripts/templates/browse/feature_list.jst.ejs b/app/assets/javascripts/templates/browse/feature_list.jst.ejs
new file mode 100644 (file)
index 0000000..ada7d08
--- /dev/null
+++ b/app/assets/javascripts/templates/browse/feature_list.jst.ejs
@@ -0,0 +1,9 @@
+<div>
+  <p class="browse_heading"><%- I18n.t('browse.start_rjs.object_list.heading') %></p>
+  <ul>
+    <% for (var i = 0; i < features.length; i++) { %>
+      <li><%- features[i].typeName %> <a href="<%- features[i].url %>" data-feature-id="<%- features[i].id %>"><%- features[i].name %></a></li>
+    <% } %>
+  </ul>
+  <a href="<%- url %>"><%- I18n.t('browse.start_rjs.object_list.api') %></a>
+</div>