aboutsummaryrefslogtreecommitdiffstats
path: root/src/Angular.js
diff options
context:
space:
mode:
authorMisko Hevery2011-02-12 08:58:11 -0800
committerMisko Hevery2011-02-16 08:59:57 -0500
commitcdc093a463e8f8a925cbb9f2b55bedf0a1d8e7e8 (patch)
treec481c1b86986f156646eafc9d0ec4db852edb455 /src/Angular.js
parent00cc9eb32a9387040d0175fcfd21cf9dcab6514f (diff)
downloadangular.js-cdc093a463e8f8a925cbb9f2b55bedf0a1d8e7e8.tar.bz2
reformated multiline trinary expressions to have a leading ?/:.
Diffstat (limited to 'src/Angular.js')
-rw-r--r--src/Angular.js28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 99a4528d..87be29a7 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -30,12 +30,14 @@ var uppercase = function (string){ return isString(string) ? string.toUpperCase(
var manualLowercase = function (s) {
- return isString(s) ? s.replace(/[A-Z]/g,
- function (ch) {return fromCharCode(ch.charCodeAt(0) | 32); }) : s;
+ return isString(s)
+ ? s.replace(/[A-Z]/g, function (ch) {return fromCharCode(ch.charCodeAt(0) | 32); })
+ : s;
};
var manualUppercase = function (s) {
- return isString(s) ? s.replace(/[a-z]/g,
- function (ch) {return fromCharCode(ch.charCodeAt(0) & ~32); }) : s;
+ return isString(s)
+ ? s.replace(/[a-z]/g, function (ch) {return fromCharCode(ch.charCodeAt(0) & ~32); })
+ : s;
};
@@ -89,7 +91,9 @@ var _undefined = undefined,
jQuery, // delay binding
slice = Array.prototype.slice,
push = Array.prototype.push,
- error = window[$console] ? bind(window[$console], window[$console]['error'] || noop) : noop,
+ error = window[$console]
+ ? bind(window[$console], window[$console]['error'] || noop)
+ : noop,
/** @name angular */
angular = window[$angular] || (window[$angular] = {}),
@@ -417,13 +421,13 @@ function isElement(node) {
*/
function HTML(html, option) {
this.html = html;
- this.get = lowercase(option) == 'unsafe' ?
- valueFn(html) :
- function htmlSanitize() {
- var buf = [];
- htmlParser(html, htmlSanitizeWriter(buf));
- return buf.join('');
- };
+ this.get = lowercase(option) == 'unsafe'
+ ? valueFn(html)
+ : function htmlSanitize() {
+ var buf = [];
+ htmlParser(html, htmlSanitizeWriter(buf));
+ return buf.join('');
+ };
}
if (msie) {