Skip to content

Commit ab1f306

Browse files
committed
Merge pull request angular-ui#1711 from angular-ui/dev/nmccready/tryingToMakeLodash4Wurk
Lodash 4.0 /angular-ui#1682
2 parents 40ece0d + 4d1468e commit ab1f306

File tree

62 files changed

+4376
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+4376
-325
lines changed

Gruntfile.coffee

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
log = require('util').log
22
_ = require 'lodash'
3-
karmaRunner = require './grunt/karma'
3+
kickoff = require 'karma-kickoff'
4+
argv = require('yargs').argv
45

56
module.exports = (grunt) ->
67
# Load the required plugins
@@ -49,12 +50,11 @@ module.exports = (grunt) ->
4950
options.open = _.extend options.open, allExamplesOpen
5051
grunt.initConfig options
5152

53+
grunt.registerTask 'build', ['verbosity', 'clean:dist', 'jshint', 'mkdir', 'coffee',
54+
'concat:libs', 'replace', 'webpack', 'concat:dist', 'concat:streetview'
55+
'copy']
5256
# Default task: build a release in dist/
53-
grunt.registerTask "default", [
54-
'bower', 'curl',
55-
'verbosity', 'clean:dist', 'jshint', 'mkdir', 'coffee',
56-
'concat:libs', 'replace', 'webpack', 'concat:dist', 'concat:streetview'
57-
'copy', 'uglify:dist', 'uglify:streetview', 'karma']
57+
grunt.registerTask "default", ['bower', 'curl', 'build', 'uglify:dist', 'uglify:streetview', 'karma']
5858

5959
# run default "grunt" prior to generate _SpecRunner.html
6060
grunt.registerTask "spec", [
@@ -130,5 +130,18 @@ module.exports = (grunt) ->
130130
grunt.registerTask 's', 'server'
131131

132132
grunt.registerTask 'karma', 'karma runner', ->
133-
karmaRunner(grunt) @async()
133+
kickoff @async(),
134+
logFn: grunt.log.oklns
135+
configFile: require.resolve './karma.conf.coffee'
136+
137+
grunt.registerTask 'karmaSpecific', 'karma runner', ->
138+
kickoff @async(),
139+
configFile: require.resolve './karma.conf.coffee'
140+
logFn: grunt.log.oklns
141+
appendFiles: argv.files.split(',')
142+
lengthToPop: 1
143+
reporters: ['mocha']
144+
145+
grunt.registerTask 'karmaB', ['build', 'karmaSpecific']
146+
grunt.registerTask 'karmaSpecB', ['build', 'karma']
134147
#to see all tasks available don't forget "grunt --help" !!!

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dependencies": {
66
"angular": "1.2 - 1.4",
77
"angular-simple-logger": ">=0.0.1",
8-
"lodash": "3.X"
8+
"lodash": "3.X - 4.X"
99
},
1010
"ignore": [
1111
"*.json",

coffeelint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
},
7272
"no_empty_param_list": {
7373
"name": "no_empty_param_list",
74-
"level": "warn"
74+
"level": "ignore"
7575
},
7676
"no_stand_alone_at": {
7777
"name": "no_stand_alone_at",

dist/angular-google-maps-street-view.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.3.0 2016-01-23
1+
/*! angular-google-maps 2.3.0 2016-01-28
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -193,7 +193,10 @@ return UUID;
193193
]);
194194

195195
}).call(this);
196-
;(function() {
196+
;
197+
/*global _:true, angular:true, google:true */
198+
199+
(function() {
197200
angular.module('uiGmapgoogle-maps.directives.api.utils').service('uiGmapGmapUtil', [
198201
'uiGmapLogger', '$compile', function(Logger, $compile) {
199202
var _isFalse, _isTruthy, getCoords, getLatitude, getLongitude, validateCoords;

dist/angular-google-maps-street-view.min.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps-street-view_dev_mapped.js

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps-street-view_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.

0 commit comments

Comments
 (0)