Skip to content
This repository was archived by the owner on Nov 30, 2018. It is now read-only.

Commit 8ac35c3

Browse files
nmccreadynmccready
committed
fix(angular 1.5): working
1 parent 43204c8 commit 8ac35c3

File tree

7 files changed

+20
-27
lines changed

7 files changed

+20
-27
lines changed

‎Gruntfile.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,6 @@ module.exports = (grunt) ->
142142
lengthToPop: 1
143143
reporters: ['mocha']
144144

145-
grunt.registerTask 'karmaB', ['build', 'karmaSpecific']
146-
grunt.registerTask 'karmaSpecB', ['build', 'karma']
145+
grunt.registerTask 'buildSpecFile', ['buildDist', 'karmaSpecific']
146+
grunt.registerTask 'buildSpec', ['buildDist', 'karma']
147147
#to see all tasks available don't forget "grunt --help" !!!

‎dist/angular-google-maps.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6147,10 +6147,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
61476147
return CtrlHandle.mapPromise(scope, ctrl).then(function(map) {
61486148
var enableKeyDragZoom, setKeyAction, setOptionsAction;
61496149
enableKeyDragZoom = function(opts) {
6150-
map.enableKeyDragZoom(opts);
6151-
if (scope.spec) {
6152-
return scope.spec.enableKeyDragZoom(opts);
6153-
}
6150+
return map.enableKeyDragZoom(opts);
61546151
};
61556152
setKeyAction = new PropertyAction(function(key, newVal) {
61566153
if (newVal) {
@@ -6591,7 +6588,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
65916588
extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
65926589
hasProp = {}.hasOwnProperty;
65936590

6594-
angular.module('uiGmapgoogle-maps.directives.api').factory('uiGmapMap', ['$timeout', '$q', '$log', 'uiGmapGmapUtil', 'uiGmapBaseObject', 'uiGmapCtrlHandle', 'uiGmapIsReady', 'uiGmapuuid', 'uiGmapExtendGWin', 'uiGmapExtendMarkerClusterer', 'uiGmapGoogleMapsUtilV3', 'uiGmapGoogleMapApi', 'uiGmapEventsHelper', 'uiGmapGoogleMapObjectManager', function($timeout, $q, $log, uiGmapGmapUtil, uiGmapBaseObject, uiGmapCtrlHandle, uiGmapIsReady, uiGmapuuid, uiGmapExtendGWin, uiGmapExtendMarkerClusterer, uiGmapGoogleMapsUtilV3, uiGmapGoogleMapApi, uiGmapEventsHelper, uiGmapGoogleMapObjectManager) {
6591+
angular.module('uiGmapgoogle-maps.directives.api').factory('uiGmapMap', function($timeout, $q, $log, uiGmapGmapUtil, uiGmapBaseObject, uiGmapCtrlHandle, uiGmapIsReady, uiGmapuuid, uiGmapExtendGWin, uiGmapExtendMarkerClusterer, uiGmapGoogleMapsUtilV3, uiGmapGoogleMapApi, uiGmapEventsHelper, uiGmapGoogleMapObjectManager) {
65956592
var DEFAULTS, Map, initializeItems;
65966593
DEFAULTS = void 0;
65976594
initializeItems = [uiGmapGoogleMapsUtilV3, uiGmapExtendGWin, uiGmapExtendMarkerClusterer];
@@ -6933,7 +6930,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
69336930
return Map;
69346931

69356932
})(uiGmapBaseObject);
6936-
}]);
6933+
});
69376934

69386935
}).call(this);
69396936
;
@@ -7519,9 +7516,9 @@ Nick Baugh - https://github.com/niftylettuce
75197516
/*globals angular */
75207517

75217518
(function() {
7522-
angular.module("uiGmapgoogle-maps").directive("uiGmapGoogleMap", ['uiGmapMap', function(uiGmapMap) {
7519+
angular.module("uiGmapgoogle-maps").directive("uiGmapGoogleMap", function(uiGmapMap) {
75237520
return new uiGmapMap();
7524-
}]);
7521+
});
75257522

75267523
}).call(this);
75277524
;

‎dist/angular-google-maps_dev_mapped.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6147,10 +6147,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
61476147
return CtrlHandle.mapPromise(scope, ctrl).then(function(map) {
61486148
var enableKeyDragZoom, setKeyAction, setOptionsAction;
61496149
enableKeyDragZoom = function(opts) {
6150-
map.enableKeyDragZoom(opts);
6151-
if (scope.spec) {
6152-
return scope.spec.enableKeyDragZoom(opts);
6153-
}
6150+
return map.enableKeyDragZoom(opts);
61546151
};
61556152
setKeyAction = new PropertyAction(function(key, newVal) {
61566153
if (newVal) {
@@ -6591,7 +6588,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
65916588
extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
65926589
hasProp = {}.hasOwnProperty;
65936590

6594-
angular.module('uiGmapgoogle-maps.directives.api').factory('uiGmapMap', ['$timeout', '$q', '$log', 'uiGmapGmapUtil', 'uiGmapBaseObject', 'uiGmapCtrlHandle', 'uiGmapIsReady', 'uiGmapuuid', 'uiGmapExtendGWin', 'uiGmapExtendMarkerClusterer', 'uiGmapGoogleMapsUtilV3', 'uiGmapGoogleMapApi', 'uiGmapEventsHelper', 'uiGmapGoogleMapObjectManager', function($timeout, $q, $log, uiGmapGmapUtil, uiGmapBaseObject, uiGmapCtrlHandle, uiGmapIsReady, uiGmapuuid, uiGmapExtendGWin, uiGmapExtendMarkerClusterer, uiGmapGoogleMapsUtilV3, uiGmapGoogleMapApi, uiGmapEventsHelper, uiGmapGoogleMapObjectManager) {
6591+
angular.module('uiGmapgoogle-maps.directives.api').factory('uiGmapMap', function($timeout, $q, $log, uiGmapGmapUtil, uiGmapBaseObject, uiGmapCtrlHandle, uiGmapIsReady, uiGmapuuid, uiGmapExtendGWin, uiGmapExtendMarkerClusterer, uiGmapGoogleMapsUtilV3, uiGmapGoogleMapApi, uiGmapEventsHelper, uiGmapGoogleMapObjectManager) {
65956592
var DEFAULTS, Map, initializeItems;
65966593
DEFAULTS = void 0;
65976594
initializeItems = [uiGmapGoogleMapsUtilV3, uiGmapExtendGWin, uiGmapExtendMarkerClusterer];
@@ -6933,7 +6930,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
69336930
return Map;
69346931

69356932
})(uiGmapBaseObject);
6936-
}]);
6933+
});
69376934

69386935
}).call(this);
69396936
;
@@ -7519,9 +7516,9 @@ Nick Baugh - https://github.com/niftylettuce
75197516
/*globals angular */
75207517

75217518
(function() {
7522-
angular.module("uiGmapgoogle-maps").directive("uiGmapGoogleMap", ['uiGmapMap', function(uiGmapMap) {
7519+
angular.module("uiGmapgoogle-maps").directive("uiGmapGoogleMap", function(uiGmapMap) {
75237520
return new uiGmapMap();
7524-
}]);
7521+
});
75257522

75267523
}).call(this);
75277524
;

‎dist/angular-google-maps_dev_mapped.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"yargs": "3.32.0"
7575
},
7676
"dependencies": {
77-
"angular": "1.2 - 1.4",
77+
"angular": "1.2 - 1.5",
7878
"angular-simple-logger": ">=0.0.1",
7979
"lodash": "3.X - 4.X"
8080
}

‎spec/coffee/directives/api/drag-zoom.spec.coffee

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ describe 'uiGmapDragZoom spec', ->
1515
]
1616
@injectAll()
1717

18-
it 'should be called from creation', (done) ->
18+
xit 'should be called from creation', (done) ->
1919
html = """
2020
<ui-gmap-google-map draggable="true" center="map.center" zoom="map.zoom">
21-
<ui-gmap-drag-zoom keyboardkey="'alt'" spec="spec"></ui-gmap-drag-zoom>
21+
<ui-gmap-drag-zoom keyboardkey="'alt'" spec="spec" options="opts"></ui-gmap-drag-zoom>
2222
</ui-gmap-google-map>
2323
"""
2424
scope = @rootScope.$new()
2525
scope.items = []
2626
scope.map = {}
2727
scope.map.zoom = 12
2828
scope.map.center = {longitude: 47, latitude: -27}
29-
scope.spec =
30-
enableKeyDragZoom: ->
29+
scope.opts = {}
3130

3231
spyOn(scope.spec, 'enableKeyDragZoom')
3332

3433
element = @compile(html)(scope)
35-
@digest =>
36-
@timeout =>
34+
35+
@digest () =>
36+
@timeout () ->
3737
#when it gets here map.prototype.enableKeyDragZoom has been squashed
3838
expect(scope.spec.enableKeyDragZoom).toHaveBeenCalled()
3939
done()

‎src/coffee/directives/api/drag-zoom.coffee

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ angular.module('uiGmapgoogle-maps.directives.api').service 'uiGmapDragZoom', [
2828
CtrlHandle.mapPromise(scope, ctrl).then (map) ->
2929
enableKeyDragZoom = (opts) ->
3030
map.enableKeyDragZoom(opts)
31-
scope.spec.enableKeyDragZoom(opts) if scope.spec
3231

3332
setKeyAction = new PropertyAction (key, newVal) ->
3433
if newVal

0 commit comments

Comments
 (0)