Merge branch 'babel'

package.json

@@ -30,14 +30,42 @@
     "sheet-router": "^4.2.3",
     "weight-sort": "^1.3.0"
   },
+  "browserify": {
+    "transform": [
+      [
+        "babelify",
+        {
+          "presets": [
+            [
+              "env",
+              {
+                "targets": {
+                  "browsers": [
+                    "last 2 versions",
+		    "> 0.5%",
+                    "safari >= 7",
+                    "ie >= 11"
+                  ]
+                }
+              }
+            ]
+          ]
+        }
+      ]
+    ]
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "browserify -g browserify-css src/index.js -o dist/openstreetbrowser.js",
+    "build": "browserify -g browserify-css src/index.js -o dist/tmp1.js && babel --presets env dist/tmp1.js > dist/tmp2.js && mv dist/tmp2.js dist/openstreetbrowser.js && rm dist/tmp1.js",
     "watch": "watchify --debug -g browserify-css src/index.js -o dist/openstreetbrowser.js -v",
     "prepublish": "npm run build",
     "lint": "standard src/*.js"
   },
   "devDependencies": {
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babelify": "^8.0.0",
     "browserify": "^14.4.0",
     "browserify-css": "^0.14.0",
     "standard": "^10.0.2",

src/CategoryOverpass.js

@@ -349,7 +349,7 @@ CategoryOverpass.prototype.show = function (id, options, callback) {
       }
 
       callback(err, data)
-    }
+    }.bind(this)
   )
 }
 

src/ImageLoader.js

@@ -3,14 +3,6 @@ var wikipedia = require('./wikipedia')
 var cache = {}
 
 function ImageLoader (data) {
-  if (this === window) {
-    if (data.id in cache) {
-      return cache[data.id]
-    }
-
-    return new ImageLoader(data)
-  }
-
   this.sources = []
   this.found = []
   this.data = {}

src/image.js

@@ -54,7 +54,7 @@ register_hook('show-details', function (data, category, dom, callback) {
   l.className = 'loadingIndicator'
   div.appendChild(l)
 
-  var currentLoader = ImageLoader(data)
+  var currentLoader = new ImageLoader(data)
 
   data.detailsImageCounter = {}
 
@@ -124,7 +124,7 @@ register_hook('show-popup', function (data, category, dom, callback) {
 
   dom.insertBefore(div, dom.firstChild)
 
-  var currentLoader = ImageLoader(data)
+  var currentLoader = new ImageLoader(data)
   data.popupImageCounter = {}
 
   currentLoader.first({

src/index.js

@@ -33,7 +33,7 @@ require('./image')
 require('./addCategories')
 
 window.onload = function () {
-  initState = config.defaultView
+  var initState = config.defaultView
 
   map = L.map('map')