Use the jQuery data() function to access HTML 5 data attributes

diff --git a/app/assets/javascripts/key.js b/app/assets/javascripts/key.js
index daff6eee6981f63fc10c11d03c59fd6309b6ac72..1e4138b70fc7b449b4ba3cae54f5cf8c9b4a93df 100644 (file)
--- a/app/assets/javascripts/key.js
+++ b/app/assets/javascripts/key.js
@@ -8,12 +8,10 @@ $(document).ready(function () {
           mapZoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {
           mapZoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {

-        var entryLayer = $(this).attr("data-layer"),
-            entryZoomMin = parseInt($(this).attr("data-zoom-min")),
-            entryZoomMax = parseInt($(this).attr("data-zoom-max"));
+        var data = $(this).data();

 
 

-        if (mapLayer == entryLayer &&
-            mapZoom >= entryZoomMin && mapZoom <= entryZoomMax) {
+        if (mapLayer == data.layer &&
+            mapZoom >= data.zoomMin && mapZoom <= data.zoomMax) {

           $(this).show();
         } else {
           $(this).hide();
           $(this).show();
         } else {
           $(this).hide();

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 474c0806968efb442642dd99969bc58bf4564e3c..78a9d452f92d8d2465594434bb520bb4fb9973c6 100644 (file)
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -49,7 +49,7 @@ $(document).ready(function () {
         preview.addClass("loading");
       });
 
         preview.addClass("loading");
       });
 

-      preview.load(editor.attr("data-preview-url"), { text: editor.val() }, function () {
+      preview.load(editor.data("previewUrl"), { text: editor.val() }, function () {

         preview.stopTime("loading");
         preview.removeClass("loading");
       });
         preview.stopTime("loading");
         preview.removeClass("loading");
       });