Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 483ce91

Browse files
hzoopetebacondarwin
hzoo
authored and
petebacondarwin
committed
style(*): add disallowSpacesInsideParentheses rule to jscs
Closes #9685
1 parent 31ec9f1 commit 483ce91

28 files changed

+101
-100
lines changed

‎.jscs.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"disallowSpaceAfterObjectKeys": true,
77
"disallowSpaceAfterPrefixUnaryOperators": ["!"],
88
"disallowSpaceBeforeBinaryOperators": [","],
9+
"disallowSpacesInsideParentheses": true,
910
"disallowTrailingComma": true,
1011
"disallowTrailingWhitespace": true,
1112
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],

‎src/Angular.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function sortedKeys(obj) {
283283

284284
function forEachSorted(obj, iterator, context) {
285285
var keys = sortedKeys(obj);
286-
for ( var i = 0; i < keys.length; i++) {
286+
for (var i = 0; i < keys.length; i++) {
287287
iterator.call(context, obj[keys[i]], keys[i]);
288288
}
289289
return keys;
@@ -624,7 +624,7 @@ function isElement(node) {
624624
*/
625625
function makeMap(str) {
626626
var obj = {}, items = str.split(","), i;
627-
for ( i = 0; i < items.length; i++ )
627+
for (i = 0; i < items.length; i++)
628628
obj[ items[i] ] = true;
629629
return obj;
630630
}
@@ -742,7 +742,7 @@ function copy(source, destination, stackSource, stackDest) {
742742
var result;
743743
if (isArray(source)) {
744744
destination.length = 0;
745-
for ( var i = 0; i < source.length; i++) {
745+
for (var i = 0; i < source.length; i++) {
746746
result = copy(source[i], null, stackSource, stackDest);
747747
if (isObject(source[i])) {
748748
stackSource.push(source[i]);
@@ -759,7 +759,7 @@ function copy(source, destination, stackSource, stackDest) {
759759
delete destination[key];
760760
});
761761
}
762-
for ( var key in source) {
762+
for (var key in source) {
763763
if (source.hasOwnProperty(key)) {
764764
result = copy(source[key], null, stackSource, stackDest);
765765
if (isObject(source[key])) {
@@ -1047,10 +1047,10 @@ function tryDecodeURIComponent(value) {
10471047
function parseKeyValue(/**string*/keyValue) {
10481048
var obj = {}, key_value, key;
10491049
forEach((keyValue || "").split('&'), function(keyValue) {
1050-
if ( keyValue ) {
1050+
if (keyValue) {
10511051
key_value = keyValue.replace(/\+/g,'%20').split('=');
10521052
key = tryDecodeURIComponent(key_value[0]);
1053-
if ( isDefined(key) ) {
1053+
if (isDefined(key)) {
10541054
var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
10551055
if (!hasOwnProperty.call(obj, key)) {
10561056
obj[key] = val;

‎src/jqLite.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ function jqLiteData(element, key, value) {
358358
function jqLiteHasClass(element, selector) {
359359
if (!element.getAttribute) return false;
360360
return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
361-
indexOf( " " + selector + " " ) > -1);
361+
indexOf(" " + selector + " ") > -1);
362362
}
363363

364364
function jqLiteRemoveClass(element, cssClasses) {
@@ -417,7 +417,7 @@ function jqLiteAddNodes(root, elements) {
417417

418418

419419
function jqLiteController(element, name) {
420-
return jqLiteInheritedData(element, '$' + (name || 'ngController' ) + 'Controller');
420+
return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
421421
}
422422

423423
function jqLiteInheritedData(element, name, value) {
@@ -802,7 +802,7 @@ forEach({
802802
var target = this, related = event.relatedTarget;
803803
// For mousenter/leave call the handler if related is outside the target.
804804
// NB: No relatedTarget if the mouse left/entered the browser window
805-
if ( !related || (related !== target && !target.contains(related)) ){
805+
if (!related || (related !== target && !target.contains(related))){
806806
handle(event, type);
807807
}
808808
});

‎src/ng/browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ function Browser(window, document, $log, $sniffer) {
451451

452452
function $BrowserProvider(){
453453
this.$get = ['$window', '$log', '$sniffer', '$document',
454-
function( $window, $log, $sniffer, $document){
454+
function($window, $log, $sniffer, $document){
455455
return new Browser($window, $document, $log, $sniffer);
456456
}];
457457
}

‎src/ng/compile.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1010,9 +1010,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
10101010
for (var i=0; i<nbrUrisWith2parts; i++) {
10111011
var innerIdx = i*2;
10121012
// sanitize the uri
1013-
result += $$sanitizeUri(trim( rawUris[innerIdx]), true);
1013+
result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
10141014
// add the descriptor
1015-
result += ( " " + trim(rawUris[innerIdx+1]));
1015+
result += (" " + trim(rawUris[innerIdx+1]));
10161016
}
10171017

10181018
// split the last item into uri and descriptor
@@ -1291,7 +1291,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
12911291
childScope = scope;
12921292
}
12931293

1294-
if ( nodeLinkFn.transcludeOnThisElement ) {
1294+
if (nodeLinkFn.transcludeOnThisElement) {
12951295
childBoundTranscludeFn = createBoundTranscludeFn(
12961296
scope, nodeLinkFn.transclude, parentBoundTranscludeFn,
12971297
nodeLinkFn.elementTranscludeOnThisElement);
@@ -1855,7 +1855,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
18551855
isolateBindingContext[scopeName] = value;
18561856
});
18571857
attrs.$$observers[attrName].$$scope = scope;
1858-
if ( attrs[attrName] ) {
1858+
if (attrs[attrName]) {
18591859
// If the attribute has been provided then we trigger an interpolation to ensure
18601860
// the value is there for use in the link fn
18611861
isolateBindingContext[scopeName] = $interpolate(attrs[attrName])(scope);
@@ -2000,7 +2000,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
20002000
i = 0, ii = directives.length; i<ii; i++) {
20012001
try {
20022002
directive = directives[i];
2003-
if ( (maxPriority === undefined || maxPriority > directive.priority) &&
2003+
if ((maxPriority === undefined || maxPriority > directive.priority) &&
20042004
directive.restrict.indexOf(location) != -1) {
20052005
if (startAttrName) {
20062006
directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});

‎src/ng/directive/select.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
539539
key = index;
540540
if (keyName) {
541541
key = keys[index];
542-
if ( key.charAt(0) === '$' ) continue;
542+
if (key.charAt(0) === '$') continue;
543543
}
544544
value = values[key];
545545

‎src/ng/filter/filter.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function filterFilter() {
167167
case 'object':
168168
return comparator(obj, text);
169169
default:
170-
for ( var objKey in obj) {
170+
for (var objKey in obj) {
171171
if (objKey.charAt(0) !== '$' && search(obj[objKey], text)) {
172172
return true;
173173
}
@@ -176,7 +176,7 @@ function filterFilter() {
176176
}
177177
return false;
178178
case 'array':
179-
for ( var i = 0; i < obj.length; i++) {
179+
for (var i = 0; i < obj.length; i++) {
180180
if (search(obj[i], text)) {
181181
return true;
182182
}
@@ -211,7 +211,7 @@ function filterFilter() {
211211
return array;
212212
}
213213
var filtered = [];
214-
for ( var j = 0; j < array.length; j++) {
214+
for (var j = 0; j < array.length; j++) {
215215
var value = array[j];
216216
if (predicates.check(value, j)) {
217217
filtered.push(value);

‎src/ng/filter/filters.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ function dateGetter(name, size, offset, trim) {
240240
var value = date['get' + name]();
241241
if (offset > 0 || value > -offset)
242242
value += offset;
243-
if (value === 0 && offset == -12 ) value = 12;
243+
if (value === 0 && offset == -12) value = 12;
244244
return padNumber(value, size, trim);
245245
};
246246
}

‎src/ng/filter/orderBy.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function orderByFilter($parse){
128128
descending = predicate.charAt(0) == '-';
129129
predicate = predicate.substring(1);
130130
}
131-
if ( predicate === '' ) {
131+
if (predicate === '') {
132132
// Effectively no predicate was passed so we compare identity
133133
return reverseComparator(function(a, b) {
134134
return compare(a, b);
@@ -147,11 +147,11 @@ function orderByFilter($parse){
147147
}, descending);
148148
});
149149
var arrayCopy = [];
150-
for ( var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
150+
for (var i = 0; i < array.length; i++) { arrayCopy.push(array[i]); }
151151
return arrayCopy.sort(reverseComparator(comparator, reverseOrder));
152152

153153
function comparator(o1, o2){
154-
for ( var i = 0; i < sortPredicate.length; i++) {
154+
for (var i = 0; i < sortPredicate.length; i++) {
155155
var comp = sortPredicate[i](o1, o2);
156156
if (comp !== 0) return comp;
157157
}

‎src/ng/interpolate.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ function $InterpolateProvider() {
195195
expressionPositions = [];
196196

197197
while (index < textLength) {
198-
if ( ((startIndex = text.indexOf(startSymbol, index)) != -1) &&
199-
((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1) ) {
198+
if (((startIndex = text.indexOf(startSymbol, index)) != -1) &&
199+
((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1)) {
200200
if (index !== startIndex) {
201201
concat.push(unescapeText(text.substring(index, startIndex)));
202202
}

‎src/ng/location.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ function LocationHtml5Url(appBase, basePrefix) {
137137
var appUrl, prevAppUrl;
138138
var rewrittenUrl;
139139

140-
if ( (appUrl = beginsWith(appBase, url)) !== undefined ) {
140+
if ((appUrl = beginsWith(appBase, url)) !== undefined) {
141141
prevAppUrl = appUrl;
142-
if ( (appUrl = beginsWith(basePrefix, appUrl)) !== undefined ) {
142+
if ((appUrl = beginsWith(basePrefix, appUrl)) !== undefined) {
143143
rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
144144
} else {
145145
rewrittenUrl = appBase + prevAppUrl;
146146
}
147-
} else if ( (appUrl = beginsWith(appBaseNoFile, url)) !== undefined ) {
147+
} else if ((appUrl = beginsWith(appBaseNoFile, url)) !== undefined) {
148148
rewrittenUrl = appBaseNoFile + appUrl;
149149
} else if (appBaseNoFile == url + '/') {
150150
rewrittenUrl = appBaseNoFile;
@@ -278,11 +278,11 @@ function LocationHashbangInHtml5Url(appBase, hashPrefix) {
278278
var rewrittenUrl;
279279
var appUrl;
280280

281-
if ( appBase == stripHash(url) ) {
281+
if (appBase == stripHash(url)) {
282282
rewrittenUrl = url;
283-
} else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
283+
} else if ((appUrl = beginsWith(appBaseNoFile, url))) {
284284
rewrittenUrl = appBase + hashPrefix + appUrl;
285-
} else if ( appBaseNoFile === url + '/') {
285+
} else if (appBaseNoFile === url + '/') {
286286
rewrittenUrl = appBaseNoFile;
287287
}
288288
if (rewrittenUrl) {
@@ -728,7 +728,7 @@ function $LocationProvider(){
728728
*/
729729

730730
this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement',
731-
function( $rootScope, $browser, $sniffer, $rootElement) {
731+
function($rootScope, $browser, $sniffer, $rootElement) {
732732
var $location,
733733
LocationMode,
734734
baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''

‎src/ng/rootScope.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function $RootScopeProvider(){
8181
};
8282

8383
this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
84-
function( $injector, $exceptionHandler, $parse, $browser) {
84+
function($injector, $exceptionHandler, $parse, $browser) {
8585

8686
/**
8787
* @ngdoc type

‎src/ngMock/angular-mocks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ angular.mock.dump = function(object) {
876876
function serializeScope(scope, offset) {
877877
offset = offset || ' ';
878878
var log = [offset + 'Scope(' + scope.$id + '): {'];
879-
for ( var key in scope ) {
879+
for (var key in scope) {
880880
if (Object.prototype.hasOwnProperty.call(scope, key) && !key.match(/^(\$|this)/)) {
881881
log.push(' ' + key + ': ' + angular.toJson(scope[key]));
882882
}

‎src/ngRoute/directive/ngView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
179179
* Emitted every time the ngView content is reloaded.
180180
*/
181181
ngViewFactory.$inject = ['$route', '$anchorScroll', '$animate'];
182-
function ngViewFactory( $route, $anchorScroll, $animate) {
182+
function ngViewFactory($route, $anchorScroll, $animate) {
183183
return {
184184
restrict: 'ECA',
185185
terminal: true,

0 commit comments

Comments
 (0)