aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Angular.js2
-rw-r--r--src/Scope.js2
-rw-r--r--src/directives.js8
-rw-r--r--src/scenario/DSL.js4
-rw-r--r--src/scenario/Runner.js4
-rw-r--r--src/services.js8
-rw-r--r--test/BrowserSpecs.js2
-rw-r--r--test/scenario/DSLSpec.js24
-rw-r--r--test/scenario/RunnerSpec.js4
-rw-r--r--test/servicesSpec.js12
10 files changed, 33 insertions, 37 deletions
diff --git a/src/Angular.js b/src/Angular.js
index c75908a7..1c75a063 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -94,7 +94,7 @@ function extend(dst) {
function inherit(parent, extra) {
return extend(new (extend(function(){}, {prototype:parent}))(), extra);
-};
+}
function noop() {}
function identity($) {return $;}
diff --git a/src/Scope.js b/src/Scope.js
index a2ee07d9..c2a4f098 100644
--- a/src/Scope.js
+++ b/src/Scope.js
@@ -44,7 +44,7 @@ function setter(instance, path, value){
}
///////////////////////////////////
-var scopeId = 0;
+var scopeId = 0,
getterFnCache = {},
compileCache = {},
JS_KEYWORDS = {};
diff --git a/src/directives.js b/src/directives.js
index 8599d01d..994ef90e 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -34,7 +34,7 @@ angularDirective("ng:bind", function(expression){
});
this.$element = oldElement;
if (lastValue === value && lastError == error) return;
- isHtml = value instanceof HTML,
+ isHtml = value instanceof HTML;
isDomElement = isElement(value);
if (!isHtml && !isDomElement && isObject(value)) {
value = toJson(value);
@@ -85,7 +85,7 @@ function compileBindTemplate(template){
else if (isObject(value))
value = toJson(value, true);
parts.push(value);
- };
+ }
self.$element = oldElement;
return parts.join('');
};
@@ -133,7 +133,7 @@ angularDirective("ng:bind-attr", function(expression){
element.attr(key, value);
}
}
- };
+ }
}, element);
};
});
@@ -187,7 +187,7 @@ angularWidget("@ng:repeat", function(expression, element){
lastElement = childScope.$element;
index ++;
}
- };
+ }
// shrink children
while(children.length > index) {
children.pop().$element.remove();
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index 0607238c..dc85ea45 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -24,7 +24,7 @@ angular.scenario.dsl.browser = {
href: "",
hash: "",
toEqual: function(url) {
- return (this.hash == "" ? (url == this.href) :
+ return (this.hash === "" ? (url == this.href) :
(url == (this.href + "/#/" + this.hash)));
},
setLocation: function(url) {
@@ -56,7 +56,7 @@ angular.scenario.dsl.input = function(selector) {
});
}
};
-},
+};
angular.scenario.dsl.NG_BIND_PATTERN =/\{\{[^\}]+\}\}/;
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index d1a9271b..77969618 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -107,7 +107,7 @@ angular.scenario.Runner.prototype = {
} else {
self.scope.$testrun.done = true;
}
- };
+ }
callback();
},
@@ -176,7 +176,7 @@ angular.scenario.Runner.prototype = {
steps: futuresFulfilled});
done();
}
- };
+ }
next();
return specThis;
}
diff --git a/src/services.js b/src/services.js
index 41f179e9..31c5e7af 100644
--- a/src/services.js
+++ b/src/services.js
@@ -109,7 +109,7 @@ angularService('$exceptionHandler', function($log){
}, {inject:['$log']});
angularService("$hover", function(browser, document) {
- var tooltip, self = this, error, width = 300, arrowWidth = 10, body = jqLite(document[0].body);;
+ var tooltip, self = this, error, width = 300, arrowWidth = 10, body = jqLite(document[0].body);
browser.hover(function(element, show){
if (show && (error = element.attr(NG_EXCEPTION) || element.attr(NG_VALIDATION_ERROR))) {
if (!tooltip) {
@@ -345,7 +345,7 @@ angularService('$xhr.bulk', function($xhr, $error, $log){
}, {inject:['$xhr', '$xhr.error', '$log']});
angularService('$xhr.cache', function($xhr){
- var inflight = {}, self = this;;
+ var inflight = {}, self = this;
function cache(method, url, post, callback, verifyCache){
if (isFunction(post)) {
callback = post;
@@ -418,7 +418,7 @@ angularService('$cookies', function($browser) {
//delete cookies[name];
}
}
- };
+ }
}, {inject: ['$browser']});
@@ -455,4 +455,4 @@ angularService('$sessionStore', function($store) {
return new SessionStore();
-}, {inject: ['$cookies']}); \ No newline at end of file
+}, {inject: ['$cookies']});
diff --git a/test/BrowserSpecs.js b/test/BrowserSpecs.js
index f80de417..4138a9d9 100644
--- a/test/BrowserSpecs.js
+++ b/test/BrowserSpecs.js
@@ -98,7 +98,7 @@ describe('browser', function(){
var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
}
- };
+ }
var browser;
diff --git a/test/scenario/DSLSpec.js b/test/scenario/DSLSpec.js
index f8606641..7a8e2e3b 100644
--- a/test/scenario/DSLSpec.js
+++ b/test/scenario/DSLSpec.js
@@ -43,33 +43,29 @@ describe("DSL", function() {
describe('browser', function() {
var browser = angular.scenario.dsl.browser;
- it('shoud return true if location with empty hash provided is same '
- + 'as location of the page', function() {
+ it('shoud return true if location with empty hash provided is same ' +
+ 'as location of the page', function() {
browser.location.href = "http://server";
expect(browser.location.toEqual("http://server")).toEqual(true);
});
- it('shoud return true if location with hash provided is same '
- + 'as location of the page', function() {
+ it('shoud return true if location with hash provided is same ' +
+ 'as location of the page', function() {
browser.location.href = "http://server";
browser.location.hash = "hashPath";
- expect(browser.location.toEqual("http://server/#/hashPath"))
- .toEqual(true);
+ expect(browser.location.toEqual("http://server/#/hashPath")).toEqual(true);
});
- it('should return true if the location provided is the same as which '
- + 'browser navigated to', function() {
+ it('should return true if the location provided is the same as which ' +
+ 'browser navigated to', function() {
var future = browser.navigateTo("http://server/#/hashPath");
expect(future.name).toEqual("Navigate to: http://server/#/hashPath");
executeFuture(future, '<input type="text" name="name" />');
- expect(browser.location.toEqual("http://server/#/hashPath"))
- .toEqual(true);
- expect(browser.location.toEqual("http://server/"))
- .toEqual(false);
+ expect(browser.location.toEqual("http://server/#/hashPath")).toEqual(true);
+ expect(browser.location.toEqual("http://server/")).toEqual(false);
future = browser.navigateTo("http://server/");
expect(future.name).toEqual("Navigate to: http://server/");
executeFuture(future, '<input type="text" name="name" />');
- expect(browser.location.toEqual("http://server/"))
- .toEqual(true);
+ expect(browser.location.toEqual("http://server/")).toEqual(true);
});
});
diff --git a/test/scenario/RunnerSpec.js b/test/scenario/RunnerSpec.js
index b12c43c6..2986add6 100644
--- a/test/scenario/RunnerSpec.js
+++ b/test/scenario/RunnerSpec.js
@@ -47,7 +47,7 @@ describe('Runner', function() {
fail();
} catch (e) {
expect(e.message).toEqual('blah');
- };
+ }
});
});
@@ -116,7 +116,7 @@ describe('Runner', function() {
describe('future building', function() {
it('should queue futures', function() {
- function behavior(){};
+ function behavior(){}
Describe('name', function() {
It('should', function() {
$scenario.addFuture('futureName', behavior);
diff --git a/test/servicesSpec.js b/test/servicesSpec.js
index e1534e94..b39e401c 100644
--- a/test/servicesSpec.js
+++ b/test/servicesSpec.js
@@ -34,10 +34,10 @@ describe("service", function(){
describe("$log", function(){
it('should use console if present', function(){
var logger = "";
- function log(){ logger+= 'log;'; };
- function warn(){ logger+= 'warn;'; };
- function info(){ logger+= 'info;'; };
- function error(){ logger+= 'error;'; };
+ function log(){ logger+= 'log;'; }
+ function warn(){ logger+= 'warn;'; }
+ function info(){ logger+= 'info;'; }
+ function error(){ logger+= 'error;'; }
var scope = createScope(null, angularService, {$window: {console:{log:log, warn:warn, info:info, error:error}}, $document:[{cookie:''}]});
scope.$log.log();
scope.$log.warn();
@@ -48,7 +48,7 @@ describe("service", function(){
it('should use console.log if other not present', function(){
var logger = "";
- function log(){ logger+= 'log;'; };
+ function log(){ logger+= 'log;'; }
var scope = createScope(null, angularService, {$window: {console:{log:log}}, $document:[{cookie:''}]});
scope.$log.log();
scope.$log.warn();
@@ -462,4 +462,4 @@ describe("service", function(){
});
});
-}); \ No newline at end of file
+});
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 09:50:39 +0000