Merge pull request #260 from realtymaps/1.X

fix(leafletData unresolveMap): argument name renamed scopeId to mapId

Author: nmccready

.jshintrc

@@ -7,7 +7,7 @@
     "eqeqeq": true,
     "immed": true,
     "indent": 4,
-    "latedef": true,
+    "latedef": false,
     "newcap": true,
     "noarg": true,
     "regexp": true,

bower.json

@@ -34,14 +34,14 @@
     "Leaflet.utfgrid": "danzel/Leaflet.utfgrid",
     "Leaflet.awesome-markers": "*",
     "leaflet-providers": "~1.1.5",
-    "leaflet.vector-markers": "~0.0.3",
+    "leaflet.vector-markers": "0.0.4",
     "webgl-heatmap-leaflet": "*",
-    "leaflet-plugins": "*",
-    "esri-leaflet": "*",
-    "proj4": "*",
+    "leaflet-plugins": "1.X",
+    "esri-leaflet": "1.X",
+    "proj4": "2.X",
     "font-awesome": "~4.3.x",
-    "proj4leaflet": "*",
-    "Leaflet.MakiMarkers": "*",
+    "proj4leaflet": "0.X",
+    "Leaflet.MakiMarkers": "2.X",
     "Leaflet.heat": "https://github.com/Leaflet/Leaflet.heat/archive/gh-pages.tar.gz",
     "Leaflet.ExtraMarkers": "https://github.com/coryasilva/Leaflet.ExtraMarkers/archive/v1.0.1.tar.gz",
     "Leaflet.fullscreen": "http://github.com/Leaflet/Leaflet.fullscreen/archive/v0.0.4.tar.gz",

dist/ui-leaflet.js

@@ -1,5 +1,5 @@
 /*!
-*  ui-leaflet 1.0.0 2015-11-03
+*  ui-leaflet 1.0.0 2016-06-07
 *  ui-leaflet - An AngularJS directive to easily interact with Leaflet maps
 *  git: https://github.com/angular-ui/ui-leaflet
 */
@@ -456,8 +456,8 @@ angular.module('ui-leaflet').service('leafletData', ["leafletLogger", "$q", "lea
         _private[itemName] = {};
     });
 
-    this.unresolveMap = function (scopeId) {
-        var id = leafletHelpers.obtainEffectiveMapId(_private.map, scopeId);
+    this.unresolveMap = function (mapId) {
+        var id = leafletHelpers.obtainEffectiveMapId(_private.map, mapId);
         _privateItems.forEach(function (itemName) {
             _private[itemName][id] = undefined;
         });
@@ -466,14 +466,14 @@ angular.module('ui-leaflet').service('leafletData', ["leafletLogger", "$q", "lea
     //int repetitive stuff (get and sets)
     _privateItems.forEach(function (itemName) {
         var name = upperFirst(itemName);
-        self['set' + name] = function (lObject, scopeId) {
-            var defer = getUnresolvedDefer(_private[itemName], scopeId);
+        self['set' + name] = function (lObject, mapId) {
+            var defer = getUnresolvedDefer(_private[itemName], mapId);
             defer.resolve(lObject);
-            setResolvedDefer(_private[itemName], scopeId);
+            setResolvedDefer(_private[itemName], mapId);
         };
 
-        self['get' + name] = function (scopeId) {
-            var defer = getDefer(_private[itemName], scopeId);
+        self['get' + name] = function (mapId) {
+            var defer = getDefer(_private[itemName], mapId);
             return defer.promise;
         };
     });

dist/ui-leaflet.min.js

@@ -32,28 +32,27 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt-conventional-changelog": "^1.2.2",
     "grunt-graphviz": "^0.1.1",
-    "grunt-karma": "^0.10.1",
+    "grunt-karma": "2.X",
     "grunt-karma-coveralls": "^2.5.3",
     "grunt-ng-annotate": "^1.0.1",
     "grunt-open": "^0.2.3",
     "grunt-protractor-runner": "^2.0.0",
     "grunt-shell": "^1.1.2",
     "grunt-shell-spawn": "^0.3.2",
-    "jasmine-core": "^2.2.0",
     "jsdom": ">= 0.1.23 < 4.0.0",
-    "karma": "0.12.32",
+    "karma": "0.X",
     "karma-chrome-launcher": "^0.1.8",
-    "karma-coffee-preprocessor": "^0.3.0",
+    "karma-coffee-preprocessor": "1.X",
     "karma-coverage": "^0.5.3",
     "karma-firefox-launcher": "^0.1.4",
     "karma-html2js-preprocessor": "^0.1.0",
-    "karma-jasmine": "^0.3.6",
+    "karma-jasmine": "1.X",
     "karma-mocha-reporter": "1.0.2",
-    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-phantomjs-launcher": "1.X",
     "karma-requirejs": "^0.2.2",
     "karma-script-launcher": "^0.1.0",
     "load-grunt-config": "^0.17.0",
-    "lodash": "^3.7.0",
+    "lodash": "3.X.0",
     "matchdep": "^1.0.0",
     "mkdirp": "^0.5.0",
     "protractor": "^2.0.0",

dist/ui-leaflet.min.no-header.js

@@ -27,8 +27,8 @@ angular.module('ui-leaflet').service('leafletData', function (leafletLogger, $q,
         _private[itemName] = {};
     });
 
-    this.unresolveMap = function (scopeId) {
-        var id = leafletHelpers.obtainEffectiveMapId(_private.map, scopeId);
+    this.unresolveMap = function (mapId) {
+        var id = leafletHelpers.obtainEffectiveMapId(_private.map, mapId);
         _privateItems.forEach(function (itemName) {
             _private[itemName][id] = undefined;
         });
@@ -37,14 +37,14 @@ angular.module('ui-leaflet').service('leafletData', function (leafletLogger, $q,
     //int repetitive stuff (get and sets)
     _privateItems.forEach(function (itemName) {
         var name = upperFirst(itemName);
-        self['set' + name] = function (lObject, scopeId) {
-            var defer = getUnresolvedDefer(_private[itemName], scopeId);
+        self['set' + name] = function (lObject, mapId) {
+            var defer = getUnresolvedDefer(_private[itemName], mapId);
             defer.resolve(lObject);
-            setResolvedDefer(_private[itemName], scopeId);
+            setResolvedDefer(_private[itemName], mapId);
         };
 
-        self['get' + name] = function (scopeId) {
-            var defer = getDefer(_private[itemName], scopeId);
+        self['get' + name] = function (mapId) {
+            var defer = getDefer(_private[itemName], mapId);
             return defer.promise;
         };
     });

dist/ui-leaflet_dev_mapped.js

@@ -7,7 +7,7 @@ module.exports = function(karma) {
         basePath: '../',
 
         preprocessors: {
-            'test/**/**/*.coffee': ['coffee'],
+            'test/unit/**/*.coffee': ['coffee'],
         },
         coffeePreprocessor: {
             options: {
@@ -28,13 +28,12 @@ module.exports = function(karma) {
             'bower_components/leaflet.vector-markers/dist/Leaflet.vector-markers.js',
             mainLib,
             'test/unit/bootstrap.coffee',
-            'test/unit/*.js',
             'test/unit/**/*.js',
             'test/unit/**/*.coffee',
             'bower_components/Leaflet.PolylineDecorator/leaflet.polylineDecorator.js',
             //do not include those specs for jasmine html runner by karma kama_jasmine_runner.html
-            {pattern:'**/**/**/*.coffee', included: false},
-            {pattern: '**/*.js.map', included: false}
+            {pattern:'test/**/**/*.coffee', included: false},
+            {pattern: 'dist/**/*.js.map', included: false}
         ],
         // Frameworks
         frameworks: ["jasmine"],