-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added
.editorconfig
. Resolves issue #8
Updated all source files to comply with the new config.
- Loading branch information
1 parent
f6c0c2b
commit 9f57071
Showing
31 changed files
with
295 additions
and
276 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# editorconfig.org | ||
root = true | ||
|
||
[*] | ||
indent_style = space | ||
end_of_line = lf | ||
charset = utf-8 | ||
trim_trailing_whitespace = true | ||
insert_final_newline = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
bower_components | ||
node_modules | ||
.DS_Store | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,4 +4,4 @@ before_script: | |
- npm install grunt-cli -g | ||
- npm install | ||
script: | ||
- grunt test; | ||
- grunt test; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,4 @@ | |
"clean" : { | ||
"dist" : ["dist/"] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
{ | ||
{ | ||
"concat" : { | ||
"dist" : { | ||
"options" : { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,4 @@ | |
} | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,4 @@ | |
}, | ||
"source" : ["./gruntfile.js", "test/**/*.js", "dist/bottle.js"] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,4 +12,4 @@ | |
"files" : { "dist/bottle.min.js" : ["dist/bottle.js"] } | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,4 +10,4 @@ | |
} | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ var constant = function constant(name, value) { | |
}); | ||
|
||
return this; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,4 +24,4 @@ var service = function service(name, Service) { | |
} | ||
return new Service(); | ||
}); | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,4 +14,4 @@ var value = function value(name, val) { | |
}); | ||
|
||
return this; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,48 +1,48 @@ | ||
/* globals Bottle */ | ||
;(function() { | ||
"use strict"; | ||
"use strict"; | ||
|
||
/** | ||
* Bottle API test suite | ||
*/ | ||
describe("Bottle API", function() { | ||
describe("Constructor", function() { | ||
it("should allow the use of 'new'", function() { | ||
expect(new Bottle() instanceof Bottle).toBe(true); | ||
}); | ||
/** | ||
* Bottle API test suite | ||
*/ | ||
describe("Bottle API", function() { | ||
describe("Constructor", function() { | ||
it("should allow the use of 'new'", function() { | ||
expect(new Bottle() instanceof Bottle).toBe(true); | ||
}); | ||
|
||
it("creates a new instance if called like a function", function() { | ||
/* jshint newcap: false */ | ||
expect(Bottle() instanceof Bottle).toBe(true); | ||
/* jshint newcap: true */ | ||
}); | ||
it("creates a new instance if called like a function", function() { | ||
/* jshint newcap: false */ | ||
expect(Bottle() instanceof Bottle).toBe(true); | ||
/* jshint newcap: true */ | ||
}); | ||
|
||
it("creates a new instance via Bottle.pop", function() { | ||
expect(Bottle.pop() instanceof Bottle).toBe(true); | ||
}); | ||
}); | ||
describe("prototype", function() { | ||
it("exposes constant", function() { | ||
expect(Bottle.pop().constant).toBeDefined(); | ||
}); | ||
it("exposes factory", function() { | ||
expect(Bottle.pop().factory).toBeDefined(); | ||
}); | ||
it("exposes decorator", function() { | ||
expect(Bottle.pop().decorator).toBeDefined(); | ||
}); | ||
it("exposes provider", function() { | ||
expect(Bottle.pop().provider).toBeDefined(); | ||
}); | ||
it("exposes service", function() { | ||
expect(Bottle.pop().service).toBeDefined(); | ||
}); | ||
it("exposes value", function() { | ||
expect(Bottle.pop().value).toBeDefined(); | ||
}); | ||
it("exposes container on the instance", function() { | ||
expect(Bottle.pop().container).toBeDefined(); | ||
}); | ||
}); | ||
}); | ||
}()); | ||
it("creates a new instance via Bottle.pop", function() { | ||
expect(Bottle.pop() instanceof Bottle).toBe(true); | ||
}); | ||
}); | ||
describe("prototype", function() { | ||
it("exposes constant", function() { | ||
expect(Bottle.pop().constant).toBeDefined(); | ||
}); | ||
it("exposes factory", function() { | ||
expect(Bottle.pop().factory).toBeDefined(); | ||
}); | ||
it("exposes decorator", function() { | ||
expect(Bottle.pop().decorator).toBeDefined(); | ||
}); | ||
it("exposes provider", function() { | ||
expect(Bottle.pop().provider).toBeDefined(); | ||
}); | ||
it("exposes service", function() { | ||
expect(Bottle.pop().service).toBeDefined(); | ||
}); | ||
it("exposes value", function() { | ||
expect(Bottle.pop().value).toBeDefined(); | ||
}); | ||
it("exposes container on the instance", function() { | ||
expect(Bottle.pop().container).toBeDefined(); | ||
}); | ||
}); | ||
}); | ||
}()); |
Oops, something went wrong.