mirror of
https://github.com/zhigang1992/angular.js.git
synced 2026-01-12 22:45:52 +08:00
committed by
Tobias Bosch
parent
de2ecb8a96
commit
9335378602
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"disallowKeywords": ["with"],
|
||||
"disallowTrailingWhitespace": true,
|
||||
"requireRightStickedOperators": ["!"]
|
||||
"requireRightStickedOperators": ["!"],
|
||||
"requireLeftStickedOperators": [","]
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
|
||||
"disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
|
||||
"disallowRightStickedOperators": ["?", "+", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
|
||||
"requireLeftStickedOperators": [","],
|
||||
"disallowImplicitTypeConversion": ["string"],
|
||||
"disallowMultipleLineBreaks": true,
|
||||
"disallowKeywordsOnNewLine": ["else"],
|
||||
|
||||
@@ -457,7 +457,7 @@ forEach({
|
||||
return jqLite(element).data('$isolateScope') || jqLite(element).data('$isolateScopeNoTemplate');
|
||||
},
|
||||
|
||||
controller: jqLiteController ,
|
||||
controller: jqLiteController,
|
||||
|
||||
injector: function(element) {
|
||||
return jqLiteInheritedData(element, '$injector');
|
||||
|
||||
@@ -254,7 +254,7 @@ function htmlParser( html, handler ) {
|
||||
match = html.match( DOCTYPE_REGEXP );
|
||||
|
||||
if ( match ) {
|
||||
html = html.replace( match[0] , '');
|
||||
html = html.replace( match[0], '');
|
||||
chars = false;
|
||||
}
|
||||
// end tag
|
||||
|
||||
@@ -163,7 +163,7 @@ describe('injector', function() {
|
||||
function $f_n0 /*
|
||||
*/(
|
||||
$a, // x, <-- looks like an arg but it is a comment
|
||||
b_ , /* z, <-- looks like an arg but it is a
|
||||
b_, /* z, <-- looks like an arg but it is a
|
||||
multi-line comment
|
||||
function (a, b) {}
|
||||
*/
|
||||
|
||||
@@ -109,7 +109,7 @@ describe('SCE', function() {
|
||||
}));
|
||||
|
||||
it('should NOT wrap unknown contexts', inject(function($sce) {
|
||||
expect(function() { $sce.trustAs('unknown1' , '123'); }).toThrowMinErr(
|
||||
expect(function() { $sce.trustAs('unknown1', '123'); }).toThrowMinErr(
|
||||
'$sce', 'icontext', 'Attempted to trust a value in invalid context. Context: unknown1; Value: 123');
|
||||
}));
|
||||
|
||||
|
||||
@@ -222,6 +222,6 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
|
||||
});
|
||||
}
|
||||
|
||||
swipeTests('touch', true /* restrictBrowers */, 'touchstart', 'touchmove', 'touchend');
|
||||
swipeTests('mouse', false /* restrictBrowers */, 'mousedown', 'mousemove', 'mouseup');
|
||||
swipeTests('touch', /* restrictBrowers */ true, 'touchstart', 'touchmove', 'touchend');
|
||||
swipeTests('mouse', /* restrictBrowers */ false, 'mousedown', 'mousemove', 'mouseup');
|
||||
|
||||
|
||||
@@ -387,6 +387,6 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
|
||||
});
|
||||
}
|
||||
|
||||
swipeTests('touch', true /* restrictBrowers */, 'touchstart', 'touchmove', 'touchend');
|
||||
swipeTests('mouse', false /* restrictBrowers */, 'mousedown', 'mousemove', 'mouseup');
|
||||
swipeTests('touch', /* restrictBrowers */ true, 'touchstart', 'touchmove', 'touchend');
|
||||
swipeTests('mouse', /* restrictBrowers */ false, 'mousedown', 'mousemove', 'mouseup');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user