aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojta Jina2011-04-20 00:24:20 +0200
committerIgor Minar2011-04-25 08:17:17 -0700
commitf85c82acd623e63f23a4f3ebba239280f14e380b (patch)
treed4e18fa18ce3415586b736def8edfbe93d9366b1
parent35bb19856cc8f3d8923305869c0d4ffa4a03aa8f (diff)
downloadangular.js-f85c82acd623e63f23a4f3ebba239280f14e380b.tar.bz2
Fix some typos, missing semi-colons, etc...
This is a combination of 4 commits: * Fix some small typos, missing semi-colons, etc. * Fix comment for angular.scenario.SpecRunner.run method * Fixed some missing semi-colons in cookbook * Fixed missing semi-colon in nodeserver/server.js
-rw-r--r--docs/cookbook.deeplinking.ngdoc2
-rw-r--r--docs/cookbook.form.ngdoc8
-rw-r--r--lib/nodeserver/server.js2
-rw-r--r--src/scenario/SpecRunner.js3
-rw-r--r--src/widgets.js2
-rw-r--r--test/scenario/dslSpec.js2
-rw-r--r--test/widgetsSpec.js2
7 files changed, 10 insertions, 11 deletions
diff --git a/docs/cookbook.deeplinking.ngdoc b/docs/cookbook.deeplinking.ngdoc
index 90dd50bb..5270eb16 100644
--- a/docs/cookbook.deeplinking.ngdoc
+++ b/docs/cookbook.deeplinking.ngdoc
@@ -105,7 +105,7 @@ The two partials are defined in the following URLs:
# Things to notice
* Routes are defined in the `AppCntl` class. The initialization of the controller causes the
- initialization of the {@link angular.service.$rouet $route} service with the proper URL routes.
+ initialization of the {@link angular.service.$route $route} service with the proper URL routes.
* The {@link angular.service.$route $route} service then watches the URL and instantiates the
appropriate controller when the URL changes.
* The {@link angular.widget.ng:view ng:view} widget loads the view when the URL changes. It also
diff --git a/docs/cookbook.form.ngdoc b/docs/cookbook.form.ngdoc
index 7d55f0a4..c9fd9e9a 100644
--- a/docs/cookbook.form.ngdoc
+++ b/docs/cookbook.form.ngdoc
@@ -68,22 +68,22 @@ allow a user to enter data.
it('should validate zip', function(){
expect(using('.example').element(':input[name=user.address.zip]').attr('className'))
- .not().toMatch(/ng-validation-error/)
+ .not().toMatch(/ng-validation-error/);
using('.example').input('user.address.zip').enter('abc');
expect(using('.example').element(':input[name=user.address.zip]').attr('className'))
- .toMatch(/ng-validation-error/)
+ .toMatch(/ng-validation-error/);
});
it('should validate state', function(){
expect(using('.example').element(':input[name=user.address.state]').attr('className'))
- .not().toMatch(/ng-validation-error/)
+ .not().toMatch(/ng-validation-error/);
using('.example').input('user.address.state').enter('XXX');
expect(using('.example').element(':input[name=user.address.state]').attr('className'))
- .toMatch(/ng-validation-error/)
+ .toMatch(/ng-validation-error/);
});
</doc:scenario>
</doc:example>
diff --git a/lib/nodeserver/server.js b/lib/nodeserver/server.js
index bcaed299..d72bf02f 100644
--- a/lib/nodeserver/server.js
+++ b/lib/nodeserver/server.js
@@ -97,7 +97,7 @@ StaticServlet.prototype.handleRequest = function(req, res) {
return self.sendDirectory_(req, res, path);
return self.sendFile_(req, res, path);
});
-}
+};
StaticServlet.prototype.sendError_ = function(req, res, error) {
res.writeHead(500, {
diff --git a/src/scenario/SpecRunner.js b/src/scenario/SpecRunner.js
index 0e068f95..868c692d 100644
--- a/src/scenario/SpecRunner.js
+++ b/src/scenario/SpecRunner.js
@@ -16,8 +16,7 @@ angular.scenario.SpecRunner = function() {
* based on the describe nesting.
*
* @param {Object} spec A spec object
- * @param {Object} specDone An angular.scenario.Application instance
- * @param {Function} Callback function that is called when the spec finshes.
+ * @param {Function} specDone function that is called when the spec finshes. Function(error, index)
*/
angular.scenario.SpecRunner.prototype.run = function(spec, specDone) {
var self = this;
diff --git a/src/widgets.js b/src/widgets.js
index 15de0ce5..8caf0a7b 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -627,7 +627,7 @@ angularWidget('option', function(){
it('should load date filter', function(){
expect(element('.doc-example-live ng\\:include').text()).toMatch(/angular\.filter\.date/);
});
- it('should change to hmtl filter', function(){
+ it('should change to html filter', function(){
select('url').option('angular.filter.html.html');
expect(element('.doc-example-live ng\\:include').text()).toMatch(/angular\.filter\.html/);
});
diff --git a/test/scenario/dslSpec.js b/test/scenario/dslSpec.js
index d714dc45..f0534c2c 100644
--- a/test/scenario/dslSpec.js
+++ b/test/scenario/dslSpec.js
@@ -138,7 +138,7 @@ describe("angular.scenario.dsl", function() {
hashSearch: {x: 2},
hashPath: '/bar',
search: {foo: 10}
- }
+ };
} else {
throw new Error('unknown service id ' + serviceId);
}
diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js
index 3cada77b..36aabb33 100644
--- a/test/widgetsSpec.js
+++ b/test/widgetsSpec.js
@@ -901,7 +901,7 @@ describe("widget", function(){
rootScope.ChildCtrl = function() {
this.log.push('child');
- }
+ };
$location.updateHash('/foo');
$browser.xhr.expectGET('viewPartial.html').