mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-17 11:11:05 +00:00
fixed broken jstd conf file
This commit is contained in:
parent
5992e81b2e
commit
0d41c86522
4 changed files with 8 additions and 7 deletions
|
|
@ -19,5 +19,6 @@ exclude:
|
||||||
- src/angular.suffix
|
- src/angular.suffix
|
||||||
- src/angular-bootstrap.js
|
- src/angular-bootstrap.js
|
||||||
- src/AngularPublic.js
|
- src/AngularPublic.js
|
||||||
|
- src/scenario/bootstrap.js
|
||||||
- test/jquery_remove.js
|
- test/jquery_remove.js
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,4 +19,5 @@ exclude:
|
||||||
- src/angular.prefix
|
- src/angular.prefix
|
||||||
- src/angular.suffix
|
- src/angular.suffix
|
||||||
- src/angular-bootstrap.js
|
- src/angular-bootstrap.js
|
||||||
|
- src/scenario/bootstrap.js
|
||||||
- src/AngularPublic.js
|
- src/AngularPublic.js
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
//////////////////////////////
|
//////////////////////////////
|
||||||
// Browser
|
// Browser
|
||||||
//////////////////////////////
|
//////////////////////////////
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ angular.scenario.Runner = function(scope, jQuery){
|
||||||
self.currentSpec = null;
|
self.currentSpec = null;
|
||||||
};
|
};
|
||||||
this.logger = function returnNoop(){
|
this.logger = function returnNoop(){
|
||||||
return _(returnNoop).extend({close:_.identity, fail:_.identity});;
|
return extend(returnNoop, {close:noop, fail:noop});;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -59,7 +59,7 @@ angular.scenario.Runner.prototype = {
|
||||||
var element = jQuery('<li class="running '+type+'"><span></span></li>');
|
var element = jQuery('<li class="running '+type+'"><span></span></li>');
|
||||||
element.find('span').text(text);
|
element.find('span').text(text);
|
||||||
container.append(element);
|
container.append(element);
|
||||||
return _(logger(element)).extend({
|
return extend(logger(element), {
|
||||||
close: function(){
|
close: function(){
|
||||||
element.removeClass('running');
|
element.removeClass('running');
|
||||||
if(!element.hasClass('fail'))
|
if(!element.hasClass('fail'))
|
||||||
|
|
@ -80,7 +80,7 @@ angular.scenario.Runner.prototype = {
|
||||||
}
|
}
|
||||||
this.logger = logger(console);
|
this.logger = logger(console);
|
||||||
var specNames = [];
|
var specNames = [];
|
||||||
_(this.specs).each(function(spec, name){
|
foreach(this.specs, function(spec, name){
|
||||||
specNames.push(name);
|
specNames.push(name);
|
||||||
}, this);
|
}, this);
|
||||||
specNames.sort();
|
specNames.sort();
|
||||||
|
|
@ -108,7 +108,7 @@ angular.scenario.Runner.prototype = {
|
||||||
result.passed = false;
|
result.passed = false;
|
||||||
result.failed = true;
|
result.failed = true;
|
||||||
result.error = error;
|
result.error = error;
|
||||||
result.log('fail', _(error).isString() ? error : toJson(error)).fail();
|
result.log('fail', isString(error) ? error : toJson(error)).fail();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
specThis = {
|
specThis = {
|
||||||
|
|
@ -121,11 +121,11 @@ angular.scenario.Runner.prototype = {
|
||||||
function done() {
|
function done() {
|
||||||
result.finished = true;
|
result.finished = true;
|
||||||
stepLogger.close();
|
stepLogger.close();
|
||||||
(callback||_.identity).call(specThis);
|
(callback||noop).call(specThis);
|
||||||
}
|
}
|
||||||
function next(){
|
function next(){
|
||||||
var step = spec.steps[spec.nextStepIndex];
|
var step = spec.steps[spec.nextStepIndex];
|
||||||
(result.log || {close:_.identity}).close();
|
(result.log || {close:noop}).close();
|
||||||
result.log = null;
|
result.log = null;
|
||||||
if (step) {
|
if (step) {
|
||||||
spec.nextStepIndex ++;
|
spec.nextStepIndex ++;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue