vendor/assets/javascripts/ember-dev.js in ember-rails-0.2.4 vs vendor/assets/javascripts/ember-dev.js in ember-rails-0.3.1
- old
+ new
@@ -1,7 +1,136 @@
+(function() {
+/*global __fail__*/
+/**
+ Define an assertion that will throw an exception if the condition is not
+ met. Ember build tools will remove any calls to ember_assert() when
+ doing a production build.
-(function(exports) {
+ ## Examples
+
+ #js:
+
+ // pass a simple Boolean value
+ ember_assert('must pass a valid object', !!obj);
+
+ // pass a function. If the function returns false the assertion fails
+ // any other return value (including void) will pass.
+ ember_assert('a passed record must have a firstName', function() {
+ if (obj instanceof Ember.Record) {
+ return !Ember.empty(obj.firstName);
+ }
+ });
+
+ @static
+ @function
+ @param {String} desc
+ A description of the assertion. This will become the text of the Error
+ thrown if the assertion fails.
+
+ @param {Boolean} test
+ Must return true for the assertion to pass. If you pass a function it
+ will be executed. If the function returns false an exception will be
+ thrown.
+*/
+window.ember_assert = function ember_assert(desc, test) {
+ if ('function' === typeof test) test = test()!==false;
+ if (!test) throw new Error("assertion failed: "+desc);
+};
+
+
+/**
+ Display a warning with the provided message. Ember build tools will
+ remove any calls to ember_warn() when doing a production build.
+
+ @static
+ @function
+ @param {String} message
+ A warning to display.
+
+ @param {Boolean} test
+ An optional boolean or function. If the test returns false, the warning
+ will be displayed.
+*/
+window.ember_warn = function(message, test) {
+ if (arguments.length === 1) { test = false; }
+ if ('function' === typeof test) test = test()!==false;
+ if (!test) console.warn("WARNING: "+message);
+};
+
+/**
+ Display a deprecation warning with the provided message and a stack trace
+ (Chrome and Firefox only). Ember build tools will remove any calls to
+ ember_deprecate() when doing a production build.
+
+ @static
+ @function
+ @param {String} message
+ A description of the deprecation.
+
+ @param {Boolean} test
+ An optional boolean or function. If the test returns false, the deprecation
+ will be displayed.
+*/
+window.ember_deprecate = function(message, test) {
+ if (Ember.TESTING_DEPRECATION) { return; }
+
+ if (arguments.length === 1) { test = false; }
+ if ('function' === typeof test) { test = test()!==false; }
+ if (test) { return; }
+
+ if (Ember.ENV.RAISE_ON_DEPRECATION) { throw new Error(message); }
+
+ var error, stackStr = '';
+
+ // When using new Error, we can't do the arguments check for Chrome. Alternatives are welcome
+ try { __fail__.fail(); } catch (e) { error = e; }
+
+ if (error.stack) {
+ var stack;
+
+ if (error['arguments']) {
+ // Chrome
+ stack = error.stack.replace(/^\s+at\s+/gm, '').
+ replace(/^([^\(]+?)([\n$])/gm, '{anonymous}($1)$2').
+ replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}($1)').split('\n');
+ stack.shift();
+ } else {
+ // Firefox
+ stack = error.stack.replace(/(?:\n@:0)?\s+$/m, '').
+ replace(/^\(/gm, '{anonymous}(').split('\n');
+ }
+
+ stackStr = "\n " + stack.slice(2).join("\n ");
+ }
+
+ console.warn("DEPRECATION: "+message+stackStr);
+};
+
+
+
+/**
+ Display a deprecation warning with the provided message and a stack trace
+ (Chrome and Firefox only) when the wrapped method is called.
+
+ @static
+ @function
+ @param {String} message
+ A description of the deprecation.
+
+ @param {Function} func
+ The function to be deprecated.
+*/
+window.ember_deprecateFunc = function(message, func) {
+ return function() {
+ window.ember_deprecate(message);
+ return func.apply(this, arguments);
+ };
+};
+
+})();
+
+(function() {
// lib/handlebars/base.js
var Handlebars = {};
window.Handlebars = Handlebars;
@@ -105,89 +234,89 @@
productions_: [0,[3,2],[4,3],[4,1],[4,0],[6,1],[6,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[7,2],[17,3],[17,2],[17,2],[17,1],[25,2],[25,1],[27,1],[27,1],[27,1],[27,1],[26,1],[31,2],[31,1],[32,3],[32,3],[32,3],[32,3],[21,1],[35,3],[35,1]],
performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
var $0 = $$.length - 1;
switch (yystate) {
-case 1: return $$[$0-1]
+case 1: return $$[$0-1]
break;
-case 2: this.$ = new yy.ProgramNode($$[$0-2], $$[$0])
+case 2: this.$ = new yy.ProgramNode($$[$0-2], $$[$0])
break;
-case 3: this.$ = new yy.ProgramNode($$[$0])
+case 3: this.$ = new yy.ProgramNode($$[$0])
break;
-case 4: this.$ = new yy.ProgramNode([])
+case 4: this.$ = new yy.ProgramNode([])
break;
-case 5: this.$ = [$$[$0]]
+case 5: this.$ = [$$[$0]]
break;
-case 6: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]
+case 6: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]
break;
-case 7: this.$ = new yy.InverseNode($$[$0-2], $$[$0-1], $$[$0])
+case 7: this.$ = new yy.InverseNode($$[$0-2], $$[$0-1], $$[$0])
break;
-case 8: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0])
+case 8: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0])
break;
-case 9: this.$ = $$[$0]
+case 9: this.$ = $$[$0]
break;
-case 10: this.$ = $$[$0]
+case 10: this.$ = $$[$0]
break;
-case 11: this.$ = new yy.ContentNode($$[$0])
+case 11: this.$ = new yy.ContentNode($$[$0])
break;
-case 12: this.$ = new yy.CommentNode($$[$0])
+case 12: this.$ = new yy.CommentNode($$[$0])
break;
-case 13: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
+case 13: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
break;
-case 14: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
+case 14: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
break;
-case 15: this.$ = $$[$0-1]
+case 15: this.$ = $$[$0-1]
break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
+case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1])
break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true)
+case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true)
break;
-case 18: this.$ = new yy.PartialNode($$[$0-1])
+case 18: this.$ = new yy.PartialNode($$[$0-1])
break;
-case 19: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1])
+case 19: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1])
break;
-case 20:
+case 20:
break;
-case 21: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]
+case 21: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]]
break;
-case 22: this.$ = [[$$[$0-1]].concat($$[$0]), null]
+case 22: this.$ = [[$$[$0-1]].concat($$[$0]), null]
break;
-case 23: this.$ = [[$$[$0-1]], $$[$0]]
+case 23: this.$ = [[$$[$0-1]], $$[$0]]
break;
-case 24: this.$ = [[$$[$0]], null]
+case 24: this.$ = [[$$[$0]], null]
break;
-case 25: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
+case 25: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
break;
-case 26: this.$ = [$$[$0]]
+case 26: this.$ = [$$[$0]]
break;
-case 27: this.$ = $$[$0]
+case 27: this.$ = $$[$0]
break;
-case 28: this.$ = new yy.StringNode($$[$0])
+case 28: this.$ = new yy.StringNode($$[$0])
break;
-case 29: this.$ = new yy.IntegerNode($$[$0])
+case 29: this.$ = new yy.IntegerNode($$[$0])
break;
-case 30: this.$ = new yy.BooleanNode($$[$0])
+case 30: this.$ = new yy.BooleanNode($$[$0])
break;
-case 31: this.$ = new yy.HashNode($$[$0])
+case 31: this.$ = new yy.HashNode($$[$0])
break;
-case 32: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]
+case 32: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]
break;
-case 33: this.$ = [$$[$0]]
+case 33: this.$ = [$$[$0]]
break;
-case 34: this.$ = [$$[$0-2], $$[$0]]
+case 34: this.$ = [$$[$0-2], $$[$0]]
break;
-case 35: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]
+case 35: this.$ = [$$[$0-2], new yy.StringNode($$[$0])]
break;
-case 36: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]
+case 36: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]
break;
-case 37: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]
+case 37: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]
break;
-case 38: this.$ = new yy.IdNode($$[$0])
+case 38: this.$ = new yy.IdNode($$[$0])
break;
-case 39: $$[$0-2].push($$[$0]); this.$ = $$[$0-2];
+case 39: $$[$0-2].push($$[$0]); this.$ = $$[$0-2];
break;
-case 40: this.$ = [$$[$0]]
+case 40: this.$ = [$$[$0]]
break;
}
},
table: [{3:1,4:2,5:[2,4],6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{1:[3]},{5:[1,16]},{5:[2,3],7:17,8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,19],20:[2,3],22:[1,13],23:[1,14],24:[1,15]},{5:[2,5],14:[2,5],15:[2,5],16:[2,5],19:[2,5],20:[2,5],22:[2,5],23:[2,5],24:[2,5]},{4:20,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{4:21,6:3,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],24:[1,15]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],24:[2,9]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],24:[2,10]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],24:[2,11]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],24:[2,12]},{17:22,21:23,33:[1,25],35:24},{17:26,21:23,33:[1,25],35:24},{17:27,21:23,33:[1,25],35:24},{17:28,21:23,33:[1,25],35:24},{21:29,33:[1,25],35:24},{1:[2,1]},{6:30,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],24:[1,15]},{5:[2,6],14:[2,6],15:[2,6],16:[2,6],19:[2,6],20:[2,6],22:[2,6],23:[2,6],24:[2,6]},{17:22,18:[1,31],21:23,33:[1,25],35:24},{10:32,20:[1,33]},{10:34,20:[1,33]},{18:[1,35]},{18:[2,24],21:40,25:36,26:37,27:38,28:[1,41],29:[1,42],30:[1,43],31:39,32:44,33:[1,45],35:24},{18:[2,38],28:[2,38],29:[2,38],30:[2,38],33:[2,38],36:[1,46]},{18:[2,40],28:[2,40],29:[2,40],30:[2,40],33:[2,40],36:[2,40]},{18:[1,47]},{18:[1,48]},{18:[1,49]},{18:[1,50],21:51,33:[1,25],35:24},{5:[2,2],8:18,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,2],22:[1,13],23:[1,14],24:[1,15]},{14:[2,20],15:[2,20],16:[2,20],19:[2,20],22:[2,20],23:[2,20],24:[2,20]},{5:[2,7],14:[2,7],15:[2,7],16:[2,7],19:[2,7],20:[2,7],22:[2,7],23:[2,7],24:[2,7]},{21:52,33:[1,25],35:24},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],24:[2,8]},{14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],24:[2,14]},{18:[2,22],21:40,26:53,27:54,28:[1,41],29:[1,42],30:[1,43],31:39,32:44,33:[1,45],35:24},{18:[2,23]},{18:[2,26],28:[2,26],29:[2,26],30:[2,26],33:[2,26]},{18:[2,31],32:55,33:[1,56]},{18:[2,27],28:[2,27],29:[2,27],30:[2,27],33:[2,27]},{18:[2,28],28:[2,28],29:[2,28],30:[2,28],33:[2,28]},{18:[2,29],28:[2,29],29:[2,29],30:[2,29],33:[2,29]},{18:[2,30],28:[2,30],29:[2,30],30:[2,30],33:[2,30]},{18:[2,33],33:[2,33]},{18:[2,40],28:[2,40],29:[2,40],30:[2,40],33:[2,40],34:[1,57],36:[2,40]},{33:[1,58]},{14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],24:[2,13]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],24:[2,16]},{5:[2,17],14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],24:[2,17]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],24:[2,18]},{18:[1,59]},{18:[1,60]},{18:[2,21]},{18:[2,25],28:[2,25],29:[2,25],30:[2,25],33:[2,25]},{18:[2,32],33:[2,32]},{34:[1,57]},{21:61,28:[1,62],29:[1,63],30:[1,64],33:[1,25],35:24},{18:[2,39],28:[2,39],29:[2,39],30:[2,39],33:[2,39],36:[2,39]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],24:[2,19]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],24:[2,15]},{18:[2,34],33:[2,34]},{18:[2,35],33:[2,35]},{18:[2,36],33:[2,36]},{18:[2,37],33:[2,37]}],
defaultActions: {16:[2,1],37:[2,23],53:[2,21]},
@@ -236,11 +365,11 @@
return token;
};
var symbol, preErrorSymbol, state, action, a, r, yyval={},p,len,newState, expected;
while (true) {
- // retreive state number from top of stack
+ // retrieve state number from top of stack
state = stack[stack.length-1];
// use default actions if available
if (this.defaultActions[state]) {
action = this.defaultActions[state];
@@ -468,11 +597,11 @@
}
}
if (this._input === "") {
return this.EOF;
} else {
- this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
+ this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
{text: "", token: null, line: this.yylineno});
}
},
lex:function lex() {
var r = this.next();
@@ -493,61 +622,61 @@
}});
lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
var YYSTATE=YY_START
switch($avoiding_name_collisions) {
-case 0: this.begin("mu"); if (yy_.yytext) return 14;
+case 0: this.begin("mu"); if (yy_.yytext) return 14;
break;
-case 1: return 14;
+case 1: return 14;
break;
-case 2: return 24;
+case 2: return 24;
break;
-case 3: return 16;
+case 3: return 16;
break;
-case 4: return 20;
+case 4: return 20;
break;
-case 5: return 19;
+case 5: return 19;
break;
-case 6: return 19;
+case 6: return 19;
break;
-case 7: return 23;
+case 7: return 23;
break;
-case 8: return 23;
+case 8: return 23;
break;
-case 9: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.begin("INITIAL"); return 15;
+case 9: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.begin("INITIAL"); return 15;
break;
-case 10: return 22;
+case 10: return 22;
break;
-case 11: return 34;
+case 11: return 34;
break;
-case 12: return 33;
+case 12: return 33;
break;
-case 13: return 33;
+case 13: return 33;
break;
-case 14: return 36;
+case 14: return 36;
break;
-case 15: /*ignore whitespace*/
+case 15: /*ignore whitespace*/
break;
-case 16: this.begin("INITIAL"); return 18;
+case 16: this.begin("INITIAL"); return 18;
break;
-case 17: this.begin("INITIAL"); return 18;
+case 17: this.begin("INITIAL"); return 18;
break;
-case 18: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28;
+case 18: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 28;
break;
-case 19: return 30;
+case 19: return 30;
break;
-case 20: return 30;
+case 20: return 30;
break;
-case 21: return 29;
+case 21: return 29;
break;
-case 22: return 33;
+case 22: return 33;
break;
-case 23: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 33;
+case 23: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 33;
break;
-case 24: return 'INVALID';
+case 24: return 'INVALID';
break;
-case 25: return 5;
+case 25: return 5;
break;
}
};
lexer.rules = [/^[^\x00]*?(?=(\{\{))/,/^[^\x00]+/,/^\{\{>/,/^\{\{#/,/^\{\{\//,/^\{\{\^/,/^\{\{\s*else\b/,/^\{\{\{/,/^\{\{&/,/^\{\{![\s\S]*?\}\}/,/^\{\{/,/^=/,/^\.(?=[} ])/,/^\.\./,/^[/.]/,/^\s+/,/^\}\}\}/,/^\}\}/,/^"(\\["]|[^"])*"/,/^true(?=[}\s])/,/^false(?=[}\s])/,/^[0-9]+(?=[}\s])/,/^[a-zA-Z0-9_$-]+(?=[=}\s/.])/,/^\[.*\]/,/^./,/^$/];
lexer.conditions = {"mu":{"rules":[2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25],"inclusive":false},"INITIAL":{"rules":[0,1,25],"inclusive":true}};return lexer;})()
@@ -1592,36 +1721,36 @@
Handlebars.template = Handlebars.VM.template;
;
-})({});
+})();
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-/*globals ENV ember_assert */
+/*globals Em:true ENV */
if ('undefined' === typeof Ember) {
/**
@namespace
@name Ember
- @version 0.9.4
+ @version 0.9.7
All Ember methods and functions are defined inside of this namespace.
You generally should not add new properties to this namespace as it may be
overwritten by future versions of Ember.
You can also use the shorthand "Em" instead of "Ember".
- Ember-Runtime is a framework that provides core functions for
- Ember including cross-platform functions, support for property
- observing and objects. Its focus is on small size and performance. You can
- use this in place of or along-side other cross-platform libraries such as
+ Ember-Runtime is a framework that provides core functions for
+ Ember including cross-platform functions, support for property
+ observing and objects. Its focus is on small size and performance. You can
+ use this in place of or along-side other cross-platform libraries such as
jQuery.
The core Runtime framework is based on the jQuery API with a number of
performance optimizations.
*/
@@ -1630,35 +1759,70 @@
// objects assigned to it are given a sane string representation.
Ember = { isNamespace: true, toString: function() { return "Ember"; } };
// aliases needed to keep minifiers from removing the global context
if ('undefined' !== typeof window) {
- window.SC = window.SproutCore = window.Em = window.Ember = SC = SproutCore = Em = Ember;
+ window.Em = window.Ember = Em = Ember;
}
}
/**
@static
@type String
- @default '0.9.4'
+ @default '0.9.7'
@constant
*/
-Ember.VERSION = '0.9.4';
+Ember.VERSION = '0.9.7';
/**
@static
@type Hash
@constant
-
+
Standard environmental variables. You can define these in a global `ENV`
- variable before loading Ember to control various configuration
+ variable before loading Ember to control various configuration
settings.
*/
Ember.ENV = 'undefined' === typeof ENV ? {} : ENV;
+
+// ..........................................................
+// BOOTSTRAP
+//
+
/**
+ @static
+ @type Boolean
+ @default true
+ @constant
+
+ Determines whether Ember should enhances some built-in object
+ prototypes to provide a more friendly API. If enabled, a few methods
+ will be added to Function, String, and Array. Object.prototype will not be
+ enhanced, which is the one that causes most troubles for people.
+
+ In general we recommend leaving this option set to true since it rarely
+ conflicts with other code. If you need to turn it off however, you can
+ define an ENV.EXTEND_PROTOTYPES config to disable it.
+*/
+Ember.EXTEND_PROTOTYPES = (Ember.ENV.EXTEND_PROTOTYPES !== false);
+
+
+/**
+ @static
+ @type Boolean
+ @default Ember.EXTEND_PROTOTYPES
+ @constant
+
+ Determines whether Ember should add ECMAScript 5 shims to older browsers.
+*/
+Ember.SHIM_ES5 = (Ember.ENV.SHIM_ES5 === false) ? false : Ember.EXTEND_PROTOTYPES;
+
+
+
+/**
Empty function. Useful for some operations.
@returns {Object}
@private
*/
@@ -1668,71 +1832,48 @@
@namespace
@name window
@description The global window object
*/
-/**
- Define an assertion that will throw an exception if the condition is not
- met. Ember build tools will remove any calls to ember_assert() when
- doing a production build.
-
- ## Examples
-
- #js:
-
- // pass a simple Boolean value
- ember_assert('must pass a valid object', !!obj);
- // pass a function. If the function returns false the assertion fails
- // any other return value (including void) will pass.
- ember_assert('a passed record must have a firstName', function() {
- if (obj instanceof Ember.Record) {
- return !Ember.empty(obj.firstName);
- }
- });
-
- @static
- @function
- @param {String} desc
- A description of the assertion. This will become the text of the Error
- thrown if the assertion fails.
-
- @param {Boolean} test
- Must return true for the assertion to pass. If you pass a function it
- will be executed. If the function returns false an exception will be
- thrown.
-*/
-window.ember_assert = window.sc_assert = function ember_assert(desc, test) {
- if ('function' === typeof test) test = test()!==false;
- if (!test) throw new Error("assertion failed: "+desc);
-};
+// Stub out the methods defined by the ember-debug package in case it's not loaded
-//if ('undefined' === typeof ember_require) ember_require = Ember.K;
-if ('undefined' === typeof require) require = Ember.K;
+if ('undefined' === typeof ember_assert) {
+ window.ember_assert = Ember.K;
+}
+if ('undefined' === typeof ember_warn) { window.ember_warn = Ember.K; }
+
+if ('undefined' === typeof ember_deprecate) { window.ember_deprecate = Ember.K; }
+
+if ('undefined' === typeof ember_deprecateFunc) {
+ window.ember_deprecateFunc = function(_, func) { return func; };
+}
+
// ..........................................................
// LOGGER
-//
+//
/**
@class
Inside Ember-Metal, simply uses the window.console object.
Override this to provide more robust logging functionality.
*/
Ember.Logger = window.console || { log: Ember.K, warn: Ember.K, error: Ember.K };
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-/*globals ember_assert */
+/*globals Node */
/**
@class
Platform specific methods and feature detectors needed by the framework.
@@ -1746,10 +1887,11 @@
@name create
*/
platform.create = Object.create;
if (!platform.create) {
+ /** @private */
var O_ctor = function() {},
O_proto = O_ctor.prototype;
platform.create = function(obj, descs) {
O_ctor.prototype = obj;
@@ -1767,24 +1909,28 @@
};
platform.create.isSimulated = true;
}
-var defineProperty = Object.defineProperty, canRedefineProperties, canDefinePropertyOnDOM;
+/** @private */
+var defineProperty = Object.defineProperty;
+var canRedefineProperties, canDefinePropertyOnDOM;
// Catch IE8 where Object.defineProperty exists but only works on DOM elements
if (defineProperty) {
try {
defineProperty({}, 'a',{get:function(){}});
} catch (e) {
+ /** @private */
defineProperty = null;
}
}
if (defineProperty) {
// Detects a bug in Android <3.2 where you cannot redefine a property using
// Object.defineProperty once accessors have already been set.
+ /** @private */
canRedefineProperties = (function() {
var obj = {};
defineProperty(obj, 'a', {
configurable: true,
@@ -1803,23 +1949,25 @@
return obj.a === true;
})();
// This is for Safari 5.0, which supports Object.defineProperty, but not
// on DOM nodes.
-
+ /** @private */
canDefinePropertyOnDOM = (function(){
try {
- defineProperty(document.body, 'definePropertyOnDOM', {});
+ defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
return true;
} catch(e) { }
return false;
})();
if (!canRedefineProperties) {
+ /** @private */
defineProperty = null;
} else if (!canDefinePropertyOnDOM) {
+ /** @private */
defineProperty = function(obj, keyName, desc){
var isNode;
if (typeof Node === "object") {
isNode = obj instanceof Node;
@@ -1867,32 +2015,33 @@
};
platform.defineProperty.isSimulated = true;
}
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
// ..........................................................
// GUIDS
-//
+//
// Used for guid generation...
var GUID_KEY = '__ember'+ (+ new Date());
var uuid, numberCache, stringCache;
uuid = 0;
numberCache = [];
stringCache = {};
-var GUID_DESC = {
+var GUID_DESC = Ember.GUID_DESC = {
configurable: true,
writable: true,
enumerable: false
};
@@ -1907,11 +2056,11 @@
A unique key used to assign guids and other private metadata to objects.
If you inspect an object in your browser debugger you will often see these.
They can be safely ignored.
- On browsers that support it, these properties are added with enumeration
+ On browsers that support it, these properties are added with enumeration
disabled so they won't show up when you iterate over your properties.
*/
Ember.GUID_KEY = GUID_KEY;
/**
@@ -1921,11 +2070,11 @@
pass in. You will rarely need to use this method. Instead you should
call Ember.guidFor(obj), which return an existing guid if available.
@param {Object} obj
Optional object the guid will be used for. If passed in, the guid will
- be saved on the object and reused whenever you pass the same object
+ be saved on the object and reused whenever you pass the same object
again.
If no object is passed, just generate a new guid.
@param {String} prefix
@@ -1992,11 +2141,11 @@
};
// ..........................................................
// META
-//
+//
var META_DESC = {
writable: true,
configurable: false,
enumerable: false,
@@ -2015,62 +2164,67 @@
// Placeholder for non-writable metas.
var EMPTY_META = {
descs: {},
watching: {}
-};
+};
if (Object.freeze) Object.freeze(EMPTY_META);
+var createMeta = Ember.platform.defineProperty.isSimulated ? o_create : (function(meta) { return meta; });
+
/**
@private
@function
-
+
Retrieves the meta hash for an object. If 'writable' is true ensures the
hash is writable for this object as well.
-
+
The meta object contains information about computed property descriptors as
well as any watched properties and other information. You generally will
- not access this information directly but instead work with higher level
- methods that manipulate this has indirectly.
+ not access this information directly but instead work with higher level
+ methods that manipulate this hash indirectly.
@param {Object} obj
The object to retrieve meta for
-
+
@param {Boolean} writable
- Pass false if you do not intend to modify the meta hash, allowing the
+ Pass false if you do not intend to modify the meta hash, allowing the
method to avoid making an unnecessary copy.
-
+
@returns {Hash}
*/
Ember.meta = function meta(obj, writable) {
var ret = obj[META_KEY];
if (writable===false) return ret || EMPTY_META;
if (!ret) {
o_defineProperty(obj, META_KEY, META_DESC);
- ret = obj[META_KEY] = {
+ ret = obj[META_KEY] = createMeta({
descs: {},
watching: {},
values: {},
lastSetValues: {},
cache: {},
source: obj
- };
-
+ });
+
// make sure we don't accidentally try to create constructor like desc
ret.descs.constructor = null;
-
+
} else if (ret.source !== obj) {
- ret = obj[META_KEY] = o_create(ret);
+ ret = o_create(ret);
ret.descs = o_create(ret.descs);
ret.values = o_create(ret.values);
ret.watching = o_create(ret.watching);
ret.lastSetValues = {};
ret.cache = {};
ret.source = obj;
+
+ o_defineProperty(obj, META_KEY, META_DESC);
+ ret = obj[META_KEY] = createMeta(ret);
}
return ret;
};
Ember.getMeta = function getMeta(obj, property) {
@@ -2140,49 +2294,52 @@
@private
Wraps the passed function so that `this._super` will point to the superFunc
when the function is invoked. This is the primitive we use to implement
calls to super.
-
+
@param {Function} func
The function to call
-
+
@param {Function} superFunc
The super function.
-
+
@returns {Function} wrapped function.
*/
Ember.wrap = function(func, superFunc) {
-
+
function K() {}
-
+
var newFunc = function() {
var ret, sup = this._super;
this._super = superFunc || K;
ret = func.apply(this, arguments);
this._super = sup;
return ret;
};
-
+
newFunc.base = func;
return newFunc;
};
/**
- @function
-
- Returns YES if the passed object is an array or Array-like.
+ Returns true if the passed object is an array or Array-like.
Ember Array Protocol:
- the object has an objectAt property
- the object is a native Array
- the object is an Object, and has a length property
Unlike Ember.typeOf this method returns true even if the passed object is
not formally array but appears to be array-like (i.e. implements Ember.Array)
+ Ember.isArray(); // false
+ Ember.isArray([]); // true
+ Ember.isArray( Ember.ArrayProxy.create({ content: [] }) ); // true
+
+ @name Ember.isArray
@param {Object} obj The object to test
@returns {Boolean}
*/
Ember.isArray = function(obj) {
if (!obj || obj.setInterval) { return false; }
@@ -2194,25 +2351,35 @@
/**
Forces the passed object to be part of an array. If the object is already
an array or array-like, returns the object. Otherwise adds the object to
an array. If obj is null or undefined, returns an empty array.
-
+
+ Ember.makeArray(); => []
+ Ember.makeArray(null); => []
+ Ember.makeArray(undefined); => []
+ Ember.makeArray('lindsay'); => ['lindsay']
+ Ember.makeArray([1,2,42]); => [1,2,42]
+
+ var controller = Ember.ArrayProxy.create({ content: [] });
+ Ember.makeArray(controller) === controller; => true
+
@param {Object} obj the object
@returns {Array}
*/
Ember.makeArray = function(obj) {
- if (obj==null) return [];
+ if (obj === null || obj === undefined) return [];
return Ember.isArray(obj) ? obj : [obj];
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -2222,11 +2389,11 @@
var meta = Ember.meta;
// ..........................................................
// GET AND SET
-//
+//
// If we are on a platform that supports accessors we can get use those.
// Otherwise simulate accessors by looking up the property directly on the
// object.
var get, set;
@@ -2235,11 +2402,11 @@
get = function get(obj, keyName) {
if (keyName === undefined && 'string' === typeof obj) {
keyName = obj;
obj = Ember;
}
-
+
if (!obj) return undefined;
var ret = obj[keyName];
if (ret===undefined && 'function'===typeof obj.unknownProperty) {
ret = obj.unknownProperty(keyName);
}
@@ -2261,11 +2428,12 @@
};
if (!USE_ACCESSORS) {
var o_get = get, o_set = set;
-
+
+ /** @private */
get = function(obj, keyName) {
if (keyName === undefined && 'string' === typeof obj) {
keyName = obj;
obj = Ember;
}
@@ -2276,10 +2444,11 @@
var desc = meta(obj, false).descs[keyName];
if (desc) return desc.get(obj, keyName);
else return o_get(obj, keyName);
};
+ /** @private */
set = function(obj, keyName, value) {
ember_assert("You need to provide an object and key to `set`.", !!obj && keyName !== undefined);
var desc = meta(obj, false).descs[keyName];
if (desc) desc.set(obj, keyName, value);
else o_set(obj, keyName, value);
@@ -2288,87 +2457,89 @@
}
/**
@function
-
+
Gets the value of a property on an object. If the property is computed,
- the function will be invoked. If the property is not defined but the
+ the function will be invoked. If the property is not defined but the
object implements the unknownProperty() method then that will be invoked.
-
- If you plan to run on IE8 and older browsers then you should use this
+
+ If you plan to run on IE8 and older browsers then you should use this
method anytime you want to retrieve a property on an object that you don't
- know for sure is private. (My convention only properties beginning with
+ know for sure is private. (My convention only properties beginning with
an underscore '_' are considered private.)
-
- On all newer browsers, you only need to use this method to retrieve
+
+ On all newer browsers, you only need to use this method to retrieve
properties if the property might not be defined on the object and you want
to respect the unknownProperty() handler. Otherwise you can ignore this
method.
-
- Note that if the obj itself is null, this method will simply return
+
+ Note that if the obj itself is null, this method will simply return
undefined.
-
+
@param {Object} obj
The object to retrieve from.
-
+
@param {String} keyName
The property key to retrieve
-
+
@returns {Object} the property value or null.
*/
Ember.get = get;
/**
- @function
-
+ @function
+
Sets the value of a property on an object, respecting computed properties
- and notifying observers and other listeners of the change. If the
+ and notifying observers and other listeners of the change. If the
property is not defined but the object implements the unknownProperty()
method then that will be invoked as well.
-
- If you plan to run on IE8 and older browsers then you should use this
+
+ If you plan to run on IE8 and older browsers then you should use this
method anytime you want to set a property on an object that you don't
- know for sure is private. (My convention only properties beginning with
+ know for sure is private. (My convention only properties beginning with
an underscore '_' are considered private.)
-
- On all newer browsers, you only need to use this method to set
+
+ On all newer browsers, you only need to use this method to set
properties if the property might not be defined on the object and you want
to respect the unknownProperty() handler. Otherwise you can ignore this
method.
-
+
@param {Object} obj
The object to modify.
-
+
@param {String} keyName
The property key to set
-
+
@param {Object} value
The value to set
-
+
@returns {Object} the passed value.
*/
Ember.set = set;
// ..........................................................
// PATHS
-//
+//
+/** @private */
function normalizePath(path) {
ember_assert('must pass non-empty string to normalizePath()', path && path!=='');
-
+
if (path==='*') return path; //special case...
var first = path.charAt(0);
if(first==='.') return 'this'+path;
if (first==='*' && path.charAt(1)!=='.') return 'this.'+path.slice(1);
return path;
}
// assumes normalized input; no *, normalized path, always a target...
+/** @private */
function getPath(target, path) {
var len = path.length, idx, next, key;
-
+
idx = path.indexOf('*');
if (idx>0 && path.charAt(idx-1)!=='.') {
return getPath(getPath(target, path.slice(0, idx)), path.slice(idx+1));
}
@@ -2390,26 +2561,28 @@
var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.\*]/;
var HAS_THIS = /^this[\.\*]/;
var FIRST_KEY = /^([^\.\*]+)/;
+/** @private */
function firstKey(path) {
return path.match(FIRST_KEY)[0];
}
// assumes path is already normalized
+/** @private */
function normalizeTuple(target, path) {
var hasThis = HAS_THIS.test(path),
isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
key;
if (!target || isGlobal) target = window;
if (hasThis) path = path.slice(5);
-
+
var idx = path.indexOf('*');
if (idx>0 && path.charAt(idx-1)!=='.') {
-
+
// should not do lookup on a prototype object because the object isn't
// really live yet.
if (target && meta(target,false).proto!==target) {
target = getPath(target, path.slice(0, idx));
} else {
@@ -2423,11 +2596,11 @@
path = path.slice(key.length+1);
}
// must return some kind of path to be valid else other things will break.
if (!path || path.length===0) throw new Error('Invalid Path');
-
+
TUPLE_RET[0] = target;
TUPLE_RET[1] = path;
return TUPLE_RET;
}
@@ -2436,47 +2609,55 @@
Normalizes a path to support older-style property paths beginning with . or
@function
@param {String} path path to normalize
- @returns {String} normalized path
+ @returns {String} normalized path
*/
Ember.normalizePath = normalizePath;
/**
@private
Normalizes a target/path pair to reflect that actual target/path that should
- be observed, etc. This takes into account passing in global property
- paths (i.e. a path beginning with a captial letter not defined on the
+ be observed, etc. This takes into account passing in global property
+ paths (i.e. a path beginning with a captial letter not defined on the
target) and * separators.
-
+
@param {Object} target
The current target. May be null.
-
+
@param {String} path
A path on the target or a global property path.
-
+
@returns {Array} a temporary array with the normalized target/path pair.
*/
Ember.normalizeTuple = function(target, path) {
return normalizeTuple(target, normalizePath(path));
};
Ember.normalizeTuple.primitive = normalizeTuple;
+Ember.getWithDefault = function(root, key, defaultValue) {
+ var value = Ember.get(root, key);
+
+ if (value === undefined) { return defaultValue; }
+ return value;
+};
+
Ember.getPath = function(root, path, _checkGlobal) {
- var hasThis, hasStar, isGlobal, ret;
-
+ var pathOnly, hasThis, hasStar, isGlobal, ret;
+
// Helpers that operate with 'this' within an #each
if (path === '') {
return root;
}
if (!path && 'string'===typeof root) {
path = root;
root = null;
+ pathOnly = true;
}
hasStar = path.indexOf('*') > -1;
// If there is no root and path is a key name, return that
@@ -2487,44 +2668,40 @@
// detect complicated paths and normalize them
path = normalizePath(path);
hasThis = HAS_THIS.test(path);
if (!root || hasThis || hasStar) {
- if (root && root !== window && IS_GLOBAL.test(path)) {
- console.warn("Fetching globals with Ember.getPath is deprecated", root, path);
- }
+ ember_deprecate("Fetching globals with Ember.getPath is deprecated (root: "+root+", path: "+path+")", !root || root === window || !IS_GLOBAL.test(path));
var tuple = normalizeTuple(root, path);
root = tuple[0];
path = tuple[1];
tuple.length = 0;
}
ret = getPath(root, path);
- if (ret === undefined && root !== window && !hasThis && IS_GLOBAL.test(path) && _checkGlobal !== false) {
- console.warn("Fetching globals with Ember.getPath is deprecated", root, path);
+ if (ret === undefined && !pathOnly && !hasThis && root !== window && IS_GLOBAL.test(path) && _checkGlobal !== false) {
+ ember_deprecate("Fetching globals with Ember.getPath is deprecated (root: "+root+", path: "+path+")");
return Ember.getPath(window, path);
} else {
return ret;
}
};
Ember.setPath = function(root, path, value, tolerant) {
var keyName;
-
+
if (arguments.length===2 && 'string' === typeof root) {
value = path;
path = root;
root = null;
}
-
+
path = normalizePath(path);
if (path.indexOf('*')>0) {
- if (root && root !== window && IS_GLOBAL.test(path)) {
- console.warn("Setting globals with Ember.setPath is deprecated", path);
- };
+ ember_deprecate("Setting globals with Ember.setPath is deprecated (path: "+path+")", !root || root === window || !IS_GLOBAL.test(path));
var tuple = normalizeTuple(root, path);
root = tuple[0];
path = tuple[1];
tuple.length = 0;
@@ -2535,20 +2712,20 @@
path = path.slice(0, path.length-(keyName.length+1));
if (path !== 'this') {
// Remove the `false` when we're done with this deprecation
root = Ember.getPath(root, path, false);
if (!root && IS_GLOBAL.test(path)) {
- console.warn("Setting globals with Ember.setPath is deprecated", path);
+ ember_deprecate("Setting globals with Ember.setPath is deprecated (path: "+path+")");
root = Ember.getPath(window, path);
}
}
} else {
if (IS_GLOBAL.test(path)) throw new Error('Invalid Path');
keyName = path;
}
-
+
if (!keyName || keyName.length===0 || keyName==='*') {
throw new Error('Invalid Path');
}
if (!root) {
@@ -2585,303 +2762,32 @@
*/
Ember.isGlobalPath = function(path) {
return !HAS_THIS.test(path) && IS_GLOBAL.test(path);
};
-})({});
+})();
-(function(exports) {
-// From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
-if (!Array.prototype.map)
-{
- Array.prototype.map = function(fun /*, thisp */)
- {
- "use strict";
- if (this === void 0 || this === null)
- throw new TypeError();
-
- var t = Object(this);
- var len = t.length >>> 0;
- if (typeof fun !== "function")
- throw new TypeError();
-
- var res = new Array(len);
- var thisp = arguments[1];
- for (var i = 0; i < len; i++)
- {
- if (i in t)
- res[i] = fun.call(thisp, t[i], i, t);
- }
-
- return res;
- };
-}
-
-// From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
-if (!Array.prototype.forEach)
-{
- Array.prototype.forEach = function(fun /*, thisp */)
- {
- "use strict";
-
- if (this === void 0 || this === null)
- throw new TypeError();
-
- var t = Object(this);
- var len = t.length >>> 0;
- if (typeof fun !== "function")
- throw new TypeError();
-
- var thisp = arguments[1];
- for (var i = 0; i < len; i++)
- {
- if (i in t)
- fun.call(thisp, t[i], i, t);
- }
- };
-}
-
-if (!Array.prototype.indexOf) {
- Array.prototype.indexOf = function (obj, fromIndex) {
- if (fromIndex == null) { fromIndex = 0; }
- else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
- for (var i = fromIndex, j = this.length; i < j; i++) {
- if (this[i] === obj) { return i; }
- }
- return -1;
- };
-}
-
-})({});
-
-
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
/*globals ember_assert */
-var AFTER_OBSERVERS = ':change';
-var BEFORE_OBSERVERS = ':before';
-var guidFor = Ember.guidFor;
-var normalizePath = Ember.normalizePath;
-
-var suspended = 0;
-var array_Slice = Array.prototype.slice;
-
-var ObserverSet = function(iterateable) {
- this.set = {};
- if (iterateable) { this.array = []; }
-};
-
-ObserverSet.prototype.add = function(target, name) {
- var set = this.set, guid = Ember.guidFor(target), array;
-
- if (!set[guid]) { set[guid] = {}; }
- set[guid][name] = true;
- if (array = this.array) {
- array.push([target, name]);
- }
-};
-
-ObserverSet.prototype.contains = function(target, name) {
- var set = this.set, guid = Ember.guidFor(target), nameSet = set[guid];
- return nameSet && nameSet[name];
-};
-
-ObserverSet.prototype.empty = function() {
- this.set = {};
- this.array = [];
-};
-
-ObserverSet.prototype.forEach = function(fn) {
- var q = this.array;
- this.empty();
- q.forEach(function(item) {
- fn(item[0], item[1]);
- });
-};
-
-var queue = new ObserverSet(true), beforeObserverSet = new ObserverSet();
-
-function notifyObservers(obj, eventName, forceNotification) {
- if (suspended && !forceNotification) {
-
- // if suspended add to the queue to send event later - but only send
- // event once.
- if (!queue.contains(obj, eventName)) {
- queue.add(obj, eventName);
- }
-
- } else {
- Ember.sendEvent(obj, eventName);
- }
-}
-
-function flushObserverQueue() {
- beforeObserverSet.empty();
-
- if (!queue || queue.array.length===0) return ;
- queue.forEach(function(target, event){ Ember.sendEvent(target, event); });
-}
-
-Ember.beginPropertyChanges = function() {
- suspended++;
- return this;
-};
-
-Ember.endPropertyChanges = function() {
- suspended--;
- if (suspended<=0) flushObserverQueue();
-};
-
-/**
- Make a series of property changes together in an
- exception-safe way.
-
- Ember.changeProperties(function() {
- obj1.set('foo', mayBlowUpWhenSet);
- obj2.set('bar', baz);
- });
-*/
-Ember.changeProperties = function(cb){
- Ember.beginPropertyChanges();
- try {
- cb();
- } finally {
- Ember.endPropertyChanges();
- }
-};
-
-function changeEvent(keyName) {
- return keyName+AFTER_OBSERVERS;
-}
-
-function beforeEvent(keyName) {
- return keyName+BEFORE_OBSERVERS;
-}
-
-function changeKey(eventName) {
- return eventName.slice(0, -7);
-}
-
-function beforeKey(eventName) {
- return eventName.slice(0, -7);
-}
-
-function xformForArgs(args) {
- return function (target, method, params) {
- var obj = params[0], keyName = changeKey(params[1]), val;
- var copy_args = args.slice();
- if (method.length>2) {
- val = Ember.getPath(Ember.isGlobalPath(keyName) ? window : obj, keyName);
- }
- copy_args.unshift(obj, keyName, val);
- method.apply(target, copy_args);
- };
-}
-
-var xformChange = xformForArgs([]);
-
-function xformBefore(target, method, params) {
- var obj = params[0], keyName = beforeKey(params[1]), val;
- if (method.length>2) val = Ember.getPath(obj, keyName);
- method.call(target, obj, keyName, val);
-}
-
-Ember.addObserver = function(obj, path, target, method) {
- path = normalizePath(path);
-
- var xform;
- if (arguments.length > 4) {
- var args = array_Slice.call(arguments, 4);
- xform = xformForArgs(args);
- } else {
- xform = xformChange;
- }
- Ember.addListener(obj, changeEvent(path), target, method, xform);
- Ember.watch(obj, path);
- return this;
-};
-
-/** @private */
-Ember.observersFor = function(obj, path) {
- return Ember.listenersFor(obj, changeEvent(path));
-};
-
-Ember.removeObserver = function(obj, path, target, method) {
- path = normalizePath(path);
- Ember.unwatch(obj, path);
- Ember.removeListener(obj, changeEvent(path), target, method);
- return this;
-};
-
-Ember.addBeforeObserver = function(obj, path, target, method) {
- path = normalizePath(path);
- Ember.addListener(obj, beforeEvent(path), target, method, xformBefore);
- Ember.watch(obj, path);
- return this;
-};
-
-/** @private */
-Ember.beforeObserversFor = function(obj, path) {
- return Ember.listenersFor(obj, beforeEvent(path));
-};
-
-Ember.removeBeforeObserver = function(obj, path, target, method) {
- path = normalizePath(path);
- Ember.unwatch(obj, path);
- Ember.removeListener(obj, beforeEvent(path), target, method);
- return this;
-};
-
-/** @private */
-Ember.notifyObservers = function(obj, keyName) {
- notifyObservers(obj, changeEvent(keyName));
-};
-
-/** @private */
-Ember.notifyBeforeObservers = function(obj, keyName) {
- var guid, set, forceNotification = false;
-
- if (suspended) {
- if (!beforeObserverSet.contains(obj, keyName)) {
- beforeObserverSet.add(obj, keyName);
- forceNotification = true;
- } else {
- return;
- }
- }
-
- notifyObservers(obj, beforeEvent(keyName), forceNotification);
-};
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Metal
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/*globals ember_assert */
var USE_ACCESSORS = Ember.USE_ACCESSORS;
var GUID_KEY = Ember.GUID_KEY;
var META_KEY = Ember.META_KEY;
var meta = Ember.meta;
var o_create = Ember.platform.create;
var o_defineProperty = Ember.platform.defineProperty;
var SIMPLE_PROPERTY, WATCHED_PROPERTY;
// ..........................................................
// DESCRIPTOR
-//
+//
var SIMPLE_DESC = {
writable: true,
configurable: true,
enumerable: true,
@@ -2889,14 +2795,14 @@
};
/**
@private
@constructor
-
+
Objects of this type can implement an interface to responds requests to
get and set. The default implementation handles simple properties.
-
+
You generally won't need to create or subclass this directly.
*/
var Dc = Ember.Descriptor = function() {};
var setup = Dc.setup = function(obj, keyName, value) {
@@ -2906,82 +2812,82 @@
};
var Dp = Ember.Descriptor.prototype;
/**
- Called whenever we want to set the property value. Should set the value
- and return the actual set value (which is usually the same but may be
+ Called whenever we want to set the property value. Should set the value
+ and return the actual set value (which is usually the same but may be
different in the case of computed properties.)
-
+
@param {Object} obj
The object to set the value on.
-
+
@param {String} keyName
The key to set.
-
+
@param {Object} value
The new value
-
+
@returns {Object} value actual set value
*/
Dp.set = function(obj, keyName, value) {
obj[keyName] = value;
return value;
};
/**
- Called whenever we want to get the property value. Should retrieve the
+ Called whenever we want to get the property value. Should retrieve the
current value.
-
+
@param {Object} obj
The object to get the value on.
-
+
@param {String} keyName
The key to retrieve
-
+
@returns {Object} the current value
*/
Dp.get = function(obj, keyName) {
return w_get(obj, keyName, obj);
};
/**
- This is called on the descriptor to set it up on the object. The
+ This is called on the descriptor to set it up on the object. The
descriptor is responsible for actually defining the property on the object
here.
-
- The passed `value` is the transferValue returned from any previous
+
+ The passed `value` is the transferValue returned from any previous
descriptor.
-
+
@param {Object} obj
The object to set the value on.
-
+
@param {String} keyName
The key to set.
-
+
@param {Object} value
The transfer value from any previous descriptor.
-
+
@returns {void}
*/
Dp.setup = setup;
/**
This is called on the descriptor just before another descriptor takes its
- place. This method should at least return the 'transfer value' of the
+ place. This method should at least return the 'transfer value' of the
property - which is the value you want to passed as the input to the new
- descriptor's setup() method.
-
+ descriptor's setup() method.
+
It is not generally necessary to actually 'undefine' the property as a new
property descriptor will redefine it immediately after this method returns.
-
+
@param {Object} obj
The object to set the value on.
-
+
@param {String} keyName
The key to set.
-
+
@returns {Object} transfer value
*/
Dp.teardown = function(obj, keyName) {
return obj[keyName];
};
@@ -2990,11 +2896,11 @@
return obj[keyName];
};
// ..........................................................
// SIMPLE AND WATCHED PROPERTIES
-//
+//
// if accessors are disabled for the app then this will act as a guard when
// testing on browsers that do support accessors. It will throw an exception
// if you do foo.bar instead of Ember.get(foo, 'bar')
@@ -3026,10 +2932,11 @@
configurable: true,
enumerable: true,
set: Ember.Descriptor.MUST_USE_SETTER
};
+/** @private */
function w_get(obj, keyName, values) {
values = values || meta(obj, false).values;
if (values) {
var ret = values[keyName];
@@ -3037,32 +2944,35 @@
if (obj.unknownProperty) { return obj.unknownProperty(keyName); }
}
}
+/** @private */
function w_set(obj, keyName, value) {
var m = meta(obj), watching;
-
- watching = m.watching[keyName]>0 && value!==m.values[keyName];
+
+ watching = m.watching[keyName]>0 && value!==m.values[keyName];
if (watching) Ember.propertyWillChange(obj, keyName);
m.values[keyName] = value;
if (watching) Ember.propertyDidChange(obj, keyName);
return value;
}
var WATCHED_GETTERS = {};
+/** @private */
function mkWatchedGetter(keyName) {
var ret = WATCHED_GETTERS[keyName];
if (!ret) {
- ret = WATCHED_GETTERS[keyName] = function() {
- return w_get(this, keyName);
+ ret = WATCHED_GETTERS[keyName] = function() {
+ return w_get(this, keyName);
};
}
return ret;
}
var WATCHED_SETTERS = {};
+/** @private */
function mkWatchedSetter(keyName) {
var ret = WATCHED_SETTERS[keyName];
if (!ret) {
ret = WATCHED_SETTERS[keyName] = function(value) {
return w_set(this, keyName, value);
@@ -3070,12 +2980,12 @@
}
return ret;
}
/**
- @private
-
+ @private
+
Private version of simple property that invokes property change callbacks.
*/
WATCHED_PROPERTY = new Ember.Descriptor();
if (Ember.platform.hasPropertyAccessors) {
@@ -3104,30 +3014,30 @@
var ret = meta(obj).values[keyName];
delete meta(obj).values[keyName];
return ret;
};
-// NOTE: if platform does not have property accessors then we just have to
+// NOTE: if platform does not have property accessors then we just have to
// set values and hope for the best. You just won't get any warnings...
} else {
-
+
WATCHED_PROPERTY.set = function(obj, keyName, value) {
var m = meta(obj), watching;
- watching = m.watching[keyName]>0 && value!==obj[keyName];
+ watching = m.watching[keyName]>0 && value!==obj[keyName];
if (watching) Ember.propertyWillChange(obj, keyName);
obj[keyName] = value;
if (watching) Ember.propertyDidChange(obj, keyName);
return value;
};
-
+
}
/**
The default descriptor for simple properties. Pass as the third argument
to Ember.defineProperty() along with a value to set a simple value.
-
+
@static
@default Ember.Descriptor
*/
Ember.SIMPLE_PROPERTY = new Ember.Descriptor();
SIMPLE_PROPERTY = Ember.SIMPLE_PROPERTY;
@@ -3136,12 +3046,13 @@
SIMPLE_PROPERTY.watched = WATCHED_PROPERTY.watched = WATCHED_PROPERTY;
// ..........................................................
// DEFINING PROPERTIES API
-//
+//
+/** @private */
function hasDesc(descs, keyName) {
if (keyName === 'toString') return 'function' !== typeof descs.toString;
else return !!descs[keyName];
}
@@ -3149,33 +3060,33 @@
@private
NOTE: This is a low-level method used by other parts of the API. You almost
never want to call this method directly. Instead you should use Ember.mixin()
to define new properties.
-
- Defines a property on an object. This method works much like the ES5
- Object.defineProperty() method except that it can also accept computed
- properties and other special descriptors.
+ Defines a property on an object. This method works much like the ES5
+ Object.defineProperty() method except that it can also accept computed
+ properties and other special descriptors.
+
Normally this method takes only three parameters. However if you pass an
instance of Ember.Descriptor as the third param then you can pass an optional
value as the fourth parameter. This is often more efficient than creating
new descriptor hashes for each property.
-
+
## Examples
// ES5 compatible mode
Ember.defineProperty(contact, 'firstName', {
writable: true,
configurable: false,
enumerable: true,
value: 'Charles'
});
-
+
// define a simple property
Ember.defineProperty(contact, 'lastName', Ember.SIMPLE_PROPERTY, 'Jolley');
-
+
// define a computed property
Ember.defineProperty(contact, 'fullName', Ember.computed(function() {
return this.firstName+' '+this.lastName;
}).property('firstName', 'lastName').cacheable());
*/
@@ -3188,16 +3099,16 @@
} else if (hasDesc(descs, keyName)) {
descs[keyName].teardown(obj, keyName);
}
if (!desc) desc = SIMPLE_PROPERTY;
-
+
if (desc instanceof Ember.Descriptor) {
m = meta(obj, true);
descs = m.descs;
-
- desc = (watching ? desc.watched : desc.unwatched) || desc;
+
+ desc = (watching ? desc.watched : desc.unwatched) || desc;
descs[keyName] = desc;
desc.setup(obj, keyName, val, watching);
// compatibility with ES5
} else {
@@ -3214,18 +3125,18 @@
/**
Creates a new object using the passed object as its prototype. On browsers
that support it, this uses the built in Object.create method. Else one is
simulated for you.
-
- This method is a better choice thant Object.create() because it will make
- sure that any observers, event listeners, and computed properties are
+
+ This method is a better choice than Object.create() because it will make
+ sure that any observers, event listeners, and computed properties are
inherited from the parent as well.
-
+
@param {Object} obj
The object you want to have as the prototype.
-
+
@returns {Object} the newly created object
*/
Ember.create = function(obj, props) {
var ret = o_create(obj, props);
if (GUID_KEY in ret) Ember.generateGuid(ret, 'ember');
@@ -3236,19 +3147,19 @@
/**
@private
Creates a new object using the passed object as its prototype. This method
acts like `Ember.create()` in every way except that bindings, observers, and
- computed properties will be activated on the object.
-
+ computed properties will be activated on the object.
+
The purpose of this method is to build an object for use in a prototype
- chain. (i.e. to be set as the `prototype` property on a constructor
+ chain. (i.e. to be set as the `prototype` property on a constructor
function). Prototype objects need to inherit bindings, observers and
other configuration so they pass it on to their children. However since
they are never 'live' objects themselves, they should not fire or make
other changes when various properties around them change.
-
+
You should use this method anytime you want to create a new object for use
in a prototype chain.
@param {Object} obj
The base object.
@@ -3264,47 +3175,798 @@
if (GUID_KEY in ret) Ember.generateGuid(ret, 'ember');
if (META_KEY in ret) Ember.rewatch(ret); // setup watch chains if needed.
return ret;
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
/*globals ember_assert */
+var meta = Ember.meta;
var guidFor = Ember.guidFor;
+var USE_ACCESSORS = Ember.USE_ACCESSORS;
+var a_slice = Array.prototype.slice;
+var o_create = Ember.platform.create;
+var o_defineProperty = Ember.platform.defineProperty;
+
+// ..........................................................
+// DEPENDENT KEYS
+//
+
+// data structure:
+// meta.deps = {
+// 'depKey': {
+// 'keyName': count,
+// __emberproto__: SRC_OBJ [to detect clones]
+// },
+// __emberproto__: SRC_OBJ
+// }
+
+/** @private */
+function uniqDeps(obj, depKey) {
+ var m = meta(obj), deps, ret;
+ deps = m.deps;
+ if (!deps) {
+ deps = m.deps = { __emberproto__: obj };
+ } else if (deps.__emberproto__ !== obj) {
+ deps = m.deps = o_create(deps);
+ deps.__emberproto__ = obj;
+ }
+
+ ret = deps[depKey];
+ if (!ret) {
+ ret = deps[depKey] = { __emberproto__: obj };
+ } else if (ret.__emberproto__ !== obj) {
+ ret = deps[depKey] = o_create(ret);
+ ret.__emberproto__ = obj;
+ }
+
+ return ret;
+}
+
+/** @private */
+function addDependentKey(obj, keyName, depKey) {
+ var deps = uniqDeps(obj, depKey);
+ deps[keyName] = (deps[keyName] || 0) + 1;
+ Ember.watch(obj, depKey);
+}
+
+/** @private */
+function removeDependentKey(obj, keyName, depKey) {
+ var deps = uniqDeps(obj, depKey);
+ deps[keyName] = (deps[keyName] || 0) - 1;
+ Ember.unwatch(obj, depKey);
+}
+
+/** @private */
+function addDependentKeys(desc, obj, keyName) {
+ var keys = desc._dependentKeys,
+ len = keys ? keys.length : 0;
+ for(var idx=0;idx<len;idx++) addDependentKey(obj, keyName, keys[idx]);
+}
+
+// ..........................................................
+// COMPUTED PROPERTY
+//
+
+/** @private */
+function ComputedProperty(func, opts) {
+ this.func = func;
+ this._cacheable = opts && opts.cacheable;
+ this._dependentKeys = opts && opts.dependentKeys;
+}
+
+/**
+ @constructor
+*/
+Ember.ComputedProperty = ComputedProperty;
+ComputedProperty.prototype = new Ember.Descriptor();
+
+var CP_DESC = {
+ configurable: true,
+ enumerable: true,
+ get: function() { return undefined; }, // for when use_accessors is false.
+ set: Ember.Descriptor.MUST_USE_SETTER // for when use_accessors is false
+};
+
+/** @private */
+function mkCpGetter(keyName, desc) {
+ var cacheable = desc._cacheable,
+ func = desc.func;
+
+ if (cacheable) {
+ return function() {
+ var ret, cache = meta(this).cache;
+ if (keyName in cache) return cache[keyName];
+ ret = cache[keyName] = func.call(this, keyName);
+ return ret ;
+ };
+ } else {
+ return function() {
+ return func.call(this, keyName);
+ };
+ }
+}
+
+/** @private */
+function mkCpSetter(keyName, desc) {
+ var cacheable = desc._cacheable,
+ func = desc.func;
+
+ return function(value) {
+ var m = meta(this, cacheable),
+ watched = (m.source===this) && m.watching[keyName]>0,
+ ret, oldSuspended, lastSetValues;
+
+ oldSuspended = desc._suspended;
+ desc._suspended = this;
+
+ watched = watched && m.lastSetValues[keyName]!==guidFor(value);
+ if (watched) {
+ m.lastSetValues[keyName] = guidFor(value);
+ Ember.propertyWillChange(this, keyName);
+ }
+
+ if (cacheable) delete m.cache[keyName];
+ ret = func.call(this, keyName, value);
+ if (cacheable) m.cache[keyName] = ret;
+ if (watched) Ember.propertyDidChange(this, keyName);
+ desc._suspended = oldSuspended;
+ return ret;
+ };
+}
+
+/**
+ @extends Ember.ComputedProperty
+ @private
+*/
+var Cp = ComputedProperty.prototype;
+
+/**
+ Call on a computed property to set it into cacheable mode. When in this
+ mode the computed property will automatically cache the return value of
+ your function until one of the dependent keys changes.
+
+ MyApp.president = Ember.Object.create({
+ fullName: function() {
+ return this.get('firstName') + ' ' + this.get('lastName');
+
+ // After calculating the value of this function, Ember.js will
+ // return that value without re-executing this function until
+ // one of the dependent properties change.
+ }.property('firstName', 'lastName').cacheable()
+ });
+
+ It is common to use `cacheable()` on nearly every computed property
+ you define.
+
+ @name Ember.ComputedProperty.cacheable
+ @param {Boolean} aFlag optional set to false to disable cacheing
+ @returns {Ember.ComputedProperty} receiver
+*/
+Cp.cacheable = function(aFlag) {
+ this._cacheable = aFlag!==false;
+ return this;
+};
+
+/**
+ Sets the dependent keys on this computed property. Pass any number of
+ arguments containing key paths that this computed property depends on.
+
+ MyApp.president = Ember.Object.create({
+ fullName: Ember.computed(function() {
+ return this.get('firstName') + ' ' + this.get('lastName');
+
+ // Tell Ember.js that this computed property depends on firstName
+ // and lastName
+ }).property('firstName', 'lastName')
+ });
+
+ @name Ember.ComputedProperty.property
+ @param {String} path... zero or more property paths
+ @returns {Ember.ComputedProperty} receiver
+*/
+Cp.property = function() {
+ this._dependentKeys = a_slice.call(arguments);
+ return this;
+};
+
+/**
+ In some cases, you may want to annotate computed properties with additional
+ metadata about how they function or what values they operate on. For example,
+ computed property functions may close over variables that are then no longer
+ available for introspection.
+
+ You can pass a hash of these values to a computed property like this:
+
+ person: function() {
+ var personId = this.get('personId');
+ return App.Person.create({ id: personId });
+ }.property().meta({ type: App.Person })
+
+ The hash that you pass to the `meta()` function will be saved on the
+ computed property descriptor under the `_meta` key. Ember runtime
+ exposes a public API for retrieving these values from classes,
+ via the `metaForProperty()` function.
+
+ @name Ember.ComputedProperty.meta
+ @param {Hash} metadata
+ @returns {Ember.ComputedProperty} property descriptor instance
+*/
+
+Cp.meta = function(meta) {
+ this._meta = meta;
+ return this;
+};
+
+/** @private - impl descriptor API */
+Cp.setup = function(obj, keyName, value) {
+ CP_DESC.get = mkCpGetter(keyName, this);
+ CP_DESC.set = mkCpSetter(keyName, this);
+ o_defineProperty(obj, keyName, CP_DESC);
+ CP_DESC.get = CP_DESC.set = null;
+ addDependentKeys(this, obj, keyName);
+};
+
+/** @private - impl descriptor API */
+Cp.teardown = function(obj, keyName) {
+ var keys = this._dependentKeys,
+ len = keys ? keys.length : 0;
+ for(var idx=0;idx<len;idx++) removeDependentKey(obj, keyName, keys[idx]);
+
+ if (this._cacheable) delete meta(obj).cache[keyName];
+
+ return null; // no value to restore
+};
+
+/** @private - impl descriptor API */
+Cp.didChange = function(obj, keyName) {
+ if (this._cacheable && (this._suspended !== obj)) {
+ delete meta(obj).cache[keyName];
+ }
+};
+
+/** @private - impl descriptor API */
+Cp.get = function(obj, keyName) {
+ var ret, cache;
+
+ if (this._cacheable) {
+ cache = meta(obj).cache;
+ if (keyName in cache) return cache[keyName];
+ ret = cache[keyName] = this.func.call(obj, keyName);
+ } else {
+ ret = this.func.call(obj, keyName);
+ }
+ return ret ;
+};
+
+/** @private - impl descriptor API */
+Cp.set = function(obj, keyName, value) {
+ var cacheable = this._cacheable;
+
+ var m = meta(obj, cacheable),
+ watched = (m.source===obj) && m.watching[keyName]>0,
+ ret, oldSuspended, lastSetValues;
+
+ oldSuspended = this._suspended;
+ this._suspended = obj;
+
+ watched = watched && m.lastSetValues[keyName]!==guidFor(value);
+ if (watched) {
+ m.lastSetValues[keyName] = guidFor(value);
+ Ember.propertyWillChange(obj, keyName);
+ }
+
+ if (cacheable) delete m.cache[keyName];
+ ret = this.func.call(obj, keyName, value);
+ if (cacheable) m.cache[keyName] = ret;
+ if (watched) Ember.propertyDidChange(obj, keyName);
+ this._suspended = oldSuspended;
+ return ret;
+};
+
+Cp.val = function(obj, keyName) {
+ return meta(obj, false).values[keyName];
+};
+
+if (!Ember.platform.hasPropertyAccessors) {
+ Cp.setup = function(obj, keyName, value) {
+ obj[keyName] = undefined; // so it shows up in key iteration
+ addDependentKeys(this, obj, keyName);
+ };
+
+} else if (!USE_ACCESSORS) {
+ Cp.setup = function(obj, keyName) {
+ // throw exception if not using Ember.get() and Ember.set() when supported
+ o_defineProperty(obj, keyName, CP_DESC);
+ addDependentKeys(this, obj, keyName);
+ };
+}
+
+/**
+ This helper returns a new property descriptor that wraps the passed
+ computed property function. You can use this helper to define properties
+ with mixins or via Ember.defineProperty().
+
+ The function you pass will be used to both get and set property values.
+ The function should accept two parameters, key and value. If value is not
+ undefined you should set the value first. In either case return the
+ current value of the property.
+
+ @param {Function} func
+ The computed property function.
+
+ @returns {Ember.ComputedProperty} property descriptor instance
+*/
+Ember.computed = function(func) {
+ var args;
+
+ if (arguments.length > 1) {
+ args = a_slice.call(arguments, 0, -1);
+ func = a_slice.call(arguments, -1)[0];
+ }
+
+ var cp = new ComputedProperty(func);
+
+ if (args) {
+ cp.property.apply(cp, args);
+ }
+
+ return cp;
+};
+
+/**
+ Returns the cached value for a property, if one exists.
+ This can be useful for peeking at the value of a computed
+ property that is generated lazily, without accidentally causing
+ it to be created.
+
+ @param {Object} obj the object whose property you want to check
+ @param {String} key the name of the property whose cached value you want
+ to return
+
+*/
+Ember.cacheFor = function(obj, key) {
+ var cache = meta(obj, false).cache;
+
+ if (cache && cache[key]) {
+ return cache[key];
+ }
+};
+
+})();
+
+
+
+(function() {
+/*jshint newcap:false*/
+
+// NOTE: There is a bug in jshint that doesn't recognize `Object()` without `new`
+// as being ok unless both `newcap:false` and not `use strict`.
+// https://github.com/jshint/jshint/issues/392
+
+// Testing this is not ideal, but we want ArrayUtils to use native functions
+// if available, but not to use versions created by libraries like Prototype
+/** @private */
+var isNativeFunc = function(func) {
+ // This should probably work in all browsers likely to have ES5 array methods
+ return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
+};
+
+// From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
+/** @private */
+var arrayMap = isNativeFunc(Array.prototype.map) ? Array.prototype.map : function(fun /*, thisp */) {
+ //"use strict";
+
+ if (this === void 0 || this === null) {
+ throw new TypeError();
+ }
+
+ var t = Object(this);
+ var len = t.length >>> 0;
+ if (typeof fun !== "function") {
+ throw new TypeError();
+ }
+
+ var res = new Array(len);
+ var thisp = arguments[1];
+ for (var i = 0; i < len; i++) {
+ if (i in t) {
+ res[i] = fun.call(thisp, t[i], i, t);
+ }
+ }
+
+ return res;
+};
+
+// From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
+/** @private */
+var arrayForEach = isNativeFunc(Array.prototype.forEach) ? Array.prototype.forEach : function(fun /*, thisp */) {
+ //"use strict";
+
+ if (this === void 0 || this === null) {
+ throw new TypeError();
+ }
+
+ var t = Object(this);
+ var len = t.length >>> 0;
+ if (typeof fun !== "function") {
+ throw new TypeError();
+ }
+
+ var thisp = arguments[1];
+ for (var i = 0; i < len; i++) {
+ if (i in t) {
+ fun.call(thisp, t[i], i, t);
+ }
+ }
+};
+
+/** @private */
+var arrayIndexOf = isNativeFunc(Array.prototype.indexOf) ? Array.prototype.indexOf : function (obj, fromIndex) {
+ if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
+ else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
+ for (var i = fromIndex, j = this.length; i < j; i++) {
+ if (this[i] === obj) { return i; }
+ }
+ return -1;
+};
+
+
+Ember.ArrayUtils = {
+ map: function(obj) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ return obj.map ? obj.map.apply(obj, args) : arrayMap.apply(obj, args);
+ },
+
+ forEach: function(obj) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ return obj.forEach ? obj.forEach.apply(obj, args) : arrayForEach.apply(obj, args);
+ },
+
+ indexOf: function(obj) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ return obj.indexOf ? obj.indexOf.apply(obj, args) : arrayIndexOf.apply(obj, args);
+ },
+
+ indexesOf: function(obj) {
+ var args = Array.prototype.slice.call(arguments, 1);
+ return args[0] === undefined ? [] : Ember.ArrayUtils.map(args[0], function(item) {
+ return Ember.ArrayUtils.indexOf(obj, item);
+ });
+ },
+
+ removeObject: function(array, item) {
+ var index = this.indexOf(array, item);
+ if (index !== -1) { array.splice(index, 1); }
+ }
+};
+
+
+if (Ember.SHIM_ES5) {
+ if (!Array.prototype.map) {
+ /** @private */
+ Array.prototype.map = arrayMap;
+ }
+
+ if (!Array.prototype.forEach) {
+ /** @private */
+ Array.prototype.forEach = arrayForEach;
+ }
+
+ if (!Array.prototype.indexOf) {
+ /** @private */
+ Array.prototype.indexOf = arrayIndexOf;
+ }
+}
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Metal
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var AFTER_OBSERVERS = ':change';
+var BEFORE_OBSERVERS = ':before';
+var guidFor = Ember.guidFor;
+var normalizePath = Ember.normalizePath;
+
+var deferred = 0;
+var array_Slice = Array.prototype.slice;
+var array_ForEach = Ember.ArrayUtils.forEach;
+
+/** @private */
+var ObserverSet = function () {
+ this.targetSet = {};
+};
+ObserverSet.prototype.add = function (target, path) {
+ var targetSet = this.targetSet,
+ targetGuid = Ember.guidFor(target),
+ pathSet = targetSet[targetGuid];
+ if (!pathSet) {
+ targetSet[targetGuid] = pathSet = {};
+ }
+ if (pathSet[path]) {
+ return false;
+ } else {
+ return pathSet[path] = true;
+ }
+};
+ObserverSet.prototype.clear = function () {
+ this.targetSet = {};
+};
+
+/** @private */
+var DeferredEventQueue = function() {
+ this.targetSet = {};
+ this.queue = [];
+};
+
+DeferredEventQueue.prototype.push = function(target, eventName) {
+ var targetSet = this.targetSet,
+ queue = this.queue,
+ targetGuid = Ember.guidFor(target),
+ eventNameSet = targetSet[targetGuid],
+ index;
+
+ if (!eventNameSet) {
+ targetSet[targetGuid] = eventNameSet = {};
+ }
+ index = eventNameSet[eventName];
+ if (index === undefined) {
+ eventNameSet[eventName] = queue.push(Ember.deferEvent(target, eventName)) - 1;
+ } else {
+ queue[index] = Ember.deferEvent(target, eventName);
+ }
+};
+
+DeferredEventQueue.prototype.flush = function() {
+ var queue = this.queue;
+ this.queue = [];
+ this.targetSet = {};
+ for (var i=0, len=queue.length; i < len; ++i) {
+ queue[i]();
+ }
+};
+
+var queue = new DeferredEventQueue(), beforeObserverSet = new ObserverSet();
+
+/** @private */
+function notifyObservers(obj, eventName, forceNotification) {
+ if (deferred && !forceNotification) {
+ queue.push(obj, eventName);
+ } else {
+ Ember.sendEvent(obj, eventName);
+ }
+}
+
+/** @private */
+function flushObserverQueue() {
+ beforeObserverSet.clear();
+
+ queue.flush();
+}
+
+Ember.beginPropertyChanges = function() {
+ deferred++;
+ return this;
+};
+
+Ember.endPropertyChanges = function() {
+ deferred--;
+ if (deferred<=0) flushObserverQueue();
+};
+
+/**
+ Make a series of property changes together in an
+ exception-safe way.
+
+ Ember.changeProperties(function() {
+ obj1.set('foo', mayBlowUpWhenSet);
+ obj2.set('bar', baz);
+ });
+*/
+Ember.changeProperties = function(cb, binding){
+ Ember.beginPropertyChanges();
+ try {
+ cb.call(binding);
+ } finally {
+ Ember.endPropertyChanges();
+ }
+};
+
+/**
+ Set a list of properties on an object. These properties are set inside
+ a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+ observers will be buffered.
+*/
+Ember.setProperties = function(self, hash) {
+ Ember.changeProperties(function(){
+ for(var prop in hash) {
+ if (hash.hasOwnProperty(prop)) Ember.set(self, prop, hash[prop]);
+ }
+ });
+ return self;
+};
+
+
+/** @private */
+function changeEvent(keyName) {
+ return keyName+AFTER_OBSERVERS;
+}
+
+/** @private */
+function beforeEvent(keyName) {
+ return keyName+BEFORE_OBSERVERS;
+}
+
+/** @private */
+function changeKey(eventName) {
+ return eventName.slice(0, -7);
+}
+
+/** @private */
+function beforeKey(eventName) {
+ return eventName.slice(0, -7);
+}
+
+/** @private */
+function xformForArgs(args) {
+ return function (target, method, params) {
+ var obj = params[0], keyName = changeKey(params[1]), val;
+ var copy_args = args.slice();
+ if (method.length>2) {
+ val = Ember.getPath(Ember.isGlobalPath(keyName) ? window : obj, keyName);
+ }
+ copy_args.unshift(obj, keyName, val);
+ method.apply(target, copy_args);
+ };
+}
+
+var xformChange = xformForArgs([]);
+
+/** @private */
+function xformBefore(target, method, params) {
+ var obj = params[0], keyName = beforeKey(params[1]), val;
+ if (method.length>2) val = Ember.getPath(obj, keyName);
+ method.call(target, obj, keyName, val);
+}
+
+Ember.addObserver = function(obj, path, target, method) {
+ path = normalizePath(path);
+
+ var xform;
+ if (arguments.length > 4) {
+ var args = array_Slice.call(arguments, 4);
+ xform = xformForArgs(args);
+ } else {
+ xform = xformChange;
+ }
+ Ember.addListener(obj, changeEvent(path), target, method, xform);
+ Ember.watch(obj, path);
+ return this;
+};
+
+/** @private */
+Ember.observersFor = function(obj, path) {
+ return Ember.listenersFor(obj, changeEvent(path));
+};
+
+Ember.removeObserver = function(obj, path, target, method) {
+ path = normalizePath(path);
+ Ember.unwatch(obj, path);
+ Ember.removeListener(obj, changeEvent(path), target, method);
+ return this;
+};
+
+Ember.addBeforeObserver = function(obj, path, target, method) {
+ path = normalizePath(path);
+ Ember.addListener(obj, beforeEvent(path), target, method, xformBefore);
+ Ember.watch(obj, path);
+ return this;
+};
+
+// Suspend observer during callback.
+//
+// This should only be used by the target of the observer
+// while it is setting the observed path.
+/** @private */
+Ember._suspendObserver = function(obj, path, target, method, callback) {
+ return Ember._suspendListener(obj, changeEvent(path), target, method, callback);
+};
+
+/** @private */
+Ember.beforeObserversFor = function(obj, path) {
+ return Ember.listenersFor(obj, beforeEvent(path));
+};
+
+Ember.removeBeforeObserver = function(obj, path, target, method) {
+ path = normalizePath(path);
+ Ember.unwatch(obj, path);
+ Ember.removeListener(obj, beforeEvent(path), target, method);
+ return this;
+};
+
+/** @private */
+Ember.notifyObservers = function(obj, keyName) {
+ if (obj.isDestroying) { return; }
+
+ notifyObservers(obj, changeEvent(keyName));
+};
+
+/** @private */
+Ember.notifyBeforeObservers = function(obj, keyName) {
+ if (obj.isDestroying) { return; }
+
+ var guid, set, forceNotification = false;
+
+ if (deferred) {
+ if (beforeObserverSet.add(obj, keyName)) {
+ forceNotification = true;
+ } else {
+ return;
+ }
+ }
+
+ notifyObservers(obj, beforeEvent(keyName), forceNotification);
+};
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Metal
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals ember_assert */
+var guidFor = Ember.guidFor;
var meta = Ember.meta;
var get = Ember.get, set = Ember.set;
var normalizeTuple = Ember.normalizeTuple.primitive;
var normalizePath = Ember.normalizePath;
var SIMPLE_PROPERTY = Ember.SIMPLE_PROPERTY;
var GUID_KEY = Ember.GUID_KEY;
var META_KEY = Ember.META_KEY;
var notifyObservers = Ember.notifyObservers;
+var forEach = Ember.ArrayUtils.forEach;
var FIRST_KEY = /^([^\.\*]+)/;
var IS_PATH = /[\.\*]/;
+/** @private */
function firstKey(path) {
return path.match(FIRST_KEY)[0];
}
// returns true if the passed path is just a keyName
+/** @private */
function isKeyName(path) {
return path==='*' || !IS_PATH.test(path);
}
// ..........................................................
// DEPENDENT KEYS
//
var DEP_SKIP = { __emberproto__: true }; // skip some keys and toString
+
+/** @private */
function iterDeps(method, obj, depKey, seen, meta) {
var guid = guidFor(obj);
if (!seen[guid]) seen[guid] = {};
if (seen[guid][depKey]) return ;
@@ -3322,29 +3984,36 @@
var WILL_SEEN, DID_SEEN;
// called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
+/** @private */
function dependentKeysWillChange(obj, depKey, meta) {
+ if (obj.isDestroying) { return; }
+
var seen = WILL_SEEN, top = !seen;
if (top) seen = WILL_SEEN = {};
iterDeps(propertyWillChange, obj, depKey, seen, meta);
if (top) WILL_SEEN = null;
}
// called whenever a property has just changed to update dependent keys
+/** @private */
function dependentKeysDidChange(obj, depKey, meta) {
+ if (obj.isDestroying) { return; }
+
var seen = DID_SEEN, top = !seen;
if (top) seen = DID_SEEN = {};
iterDeps(propertyDidChange, obj, depKey, seen, meta);
if (top) DID_SEEN = null;
}
// ..........................................................
// CHAIN
-//
+//
+/** @private */
function addChainWatcher(obj, keyName, node) {
if (!obj || ('object' !== typeof obj)) return; // nothing to do
var m = meta(obj);
var nodes = m.chainWatchers;
if (!nodes || nodes.__emberproto__ !== obj) {
@@ -3354,10 +4023,11 @@
if (!nodes[keyName]) nodes[keyName] = {};
nodes[keyName][guidFor(node)] = node;
Ember.watch(obj, keyName);
}
+/** @private */
function removeChainWatcher(obj, keyName, node) {
if (!obj || ('object' !== typeof obj)) return; // nothing to do
var m = meta(obj, false);
var nodes = m.chainWatchers;
if (!nodes || nodes.__emberproto__ !== obj) return; //nothing to do
@@ -3366,31 +4036,34 @@
}
var pendingQueue = [];
// attempts to add the pendingQueue chains again. If some of them end up
-// back in the queue and reschedule is true, schedules a timeout to try
+// back in the queue and reschedule is true, schedules a timeout to try
// again.
+/** @private */
function flushPendingChains(reschedule) {
if (pendingQueue.length===0) return ; // nothing to do
-
+
var queue = pendingQueue;
pendingQueue = [];
-
- queue.forEach(function(q) { q[0].add(q[1]); });
+
+ forEach(queue, function(q) { q[0].add(q[1]); });
if (reschedule!==false && pendingQueue.length>0) {
setTimeout(flushPendingChains, 1);
}
}
+/** @private */
function isProto(pvalue) {
return meta(pvalue, false).proto === pvalue;
}
// A ChainNode watches a single key on an object. If you provide a starting
-// value for the key then the node won't actually watch it. For a root node
+// value for the key then the node won't actually watch it. For a root node
// pass null for parent and key and object for value.
+/** @private */
var ChainNode = function(parent, key, value, separator) {
var obj;
this._parent = parent;
this._key = key;
@@ -3442,17 +4115,17 @@
// copies a top level object only
Wp.copy = function(obj) {
var ret = new ChainNode(null, null, obj, this._separator);
var paths = this._paths, path;
for(path in paths) {
- if (!(paths[path] > 0)) continue; // this check will also catch non-number vals.
+ if (paths[path] <= 0) continue; // this check will also catch non-number vals.
ret.add(path);
}
return ret;
};
-// called on the root node of a chain to setup watchers on the specified
+// called on the root node of a chain to setup watchers on the specified
// path.
Wp.add = function(path) {
var obj, tuple, key, src, separator, paths;
paths = this._paths;
@@ -3543,22 +4216,22 @@
node.count--;
if (node.count<=0) {
delete chains[node._key];
node.destroy();
}
-
+
};
Wp.willChange = function() {
var chains = this._chains;
if (chains) {
for(var key in chains) {
if (!chains.hasOwnProperty(key)) continue;
chains[key].willChange();
}
}
-
+
if (this._parent) this._parent.chainWillChange(this, this._key, 1);
};
Wp.chainWillChange = function(chain, path, depth) {
if (this._key) path = this._key+this._separator+path;
@@ -3597,11 +4270,11 @@
// Special-case: the EachProxy relies on immediate evaluation to
// establish its observers.
if (this._parent && this._parent._key === '@each')
this.value();
}
-
+
// then notify chains...
var chains = this._chains;
if (chains) {
for(var key in chains) {
if (!chains.hasOwnProperty(key)) continue;
@@ -3613,13 +4286,14 @@
// and finally tell parent about my path changing...
if (this._parent) this._parent.chainDidChange(this, this._key, 1);
};
-// get the chains for the current object. If the current object has
+// get the chains for the current object. If the current object has
// chains inherited from the proto they will be cloned and reconfigured for
// the current object.
+/** @private */
function chainsFor(obj) {
var m = meta(obj), ret = m.chains;
if (!ret) {
ret = m.chains = new ChainNode(null, null, obj);
} else if (ret.value() !== obj) {
@@ -3627,11 +4301,11 @@
}
return ret ;
}
-
+/** @private */
function notifyChains(obj, m, keyName, methodName, arg) {
var nodes = m.chainWatchers;
if (!nodes || nodes.__emberproto__ !== obj) return; // nothing to do
@@ -3644,40 +4318,42 @@
}
}
Ember.overrideChains = function(obj, keyName, m) {
notifyChains(obj, m, keyName, 'didChange', true);
-}
+};
+/** @private */
function chainsWillChange(obj, keyName, m) {
notifyChains(obj, m, keyName, 'willChange');
}
+/** @private */
function chainsDidChange(obj, keyName, m) {
notifyChains(obj, m, keyName, 'didChange');
}
// ..........................................................
// WATCH
-//
+//
var WATCHED_PROPERTY = Ember.SIMPLE_PROPERTY.watched;
/**
@private
Starts watching a property on an object. Whenever the property changes,
- invokes Ember.propertyWillChange and Ember.propertyDidChange. This is the
+ invokes Ember.propertyWillChange and Ember.propertyDidChange. This is the
primitive used by observers and dependent keys; usually you will never call
this method directly but instead use higher level methods like
Ember.addObserver().
*/
Ember.watch = function(obj, keyName) {
// can't watch length on Array - it is special...
if (keyName === 'length' && Ember.typeOf(obj)==='array') return this;
-
+
var m = meta(obj), watching = m.watching, desc;
keyName = normalizePath(keyName);
// activate watching first time
if (!watching[keyName]) {
@@ -3720,11 +4396,11 @@
}
} else if (watching[keyName]>1) {
watching[keyName]--;
}
-
+
return this;
};
/**
@private
@@ -3737,11 +4413,11 @@
var m = meta(obj, false), chains = m.chains, bindings = m.bindings, key, b;
// make sure the object has its own guid.
if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
Ember.generateGuid(obj, 'ember');
- }
+ }
// make sure any chained watchers update.
if (chains && chains.value() !== obj) chainsFor(obj);
// if the object has bindings then sync them..
@@ -3755,70 +4431,78 @@
return this;
};
// ..........................................................
// PROPERTY CHANGES
-//
+//
/**
This function is called just before an object property is about to change.
It will notify any before observers and prepare caches among other things.
-
+
Normally you will not need to call this method directly but if for some
- reason you can't directly watch a property you can invoke this method
- manually along with `Ember.propertyDidChange()` which you should call just
+ reason you can't directly watch a property you can invoke this method
+ manually along with `Ember.propertyDidChange()` which you should call just
after the property value changes.
-
+
+ @memberOf Ember
+
@param {Object} obj
The object with the property that will change
-
+
@param {String} keyName
The property key (or path) that will change.
-
+
@returns {void}
*/
-var propertyWillChange = Ember.propertyWillChange = function(obj, keyName) {
+function propertyWillChange(obj, keyName) {
var m = meta(obj, false), proto = m.proto, desc = m.descs[keyName];
if (proto === obj) return ;
if (desc && desc.willChange) desc.willChange(obj, keyName);
dependentKeysWillChange(obj, keyName, m);
chainsWillChange(obj, keyName, m);
Ember.notifyBeforeObservers(obj, keyName);
-};
+}
+Ember.propertyWillChange = propertyWillChange;
+
/**
This function is called just after an object property has changed.
It will notify any observers and clear caches among other things.
-
+
Normally you will not need to call this method directly but if for some
- reason you can't directly watch a property you can invoke this method
- manually along with `Ember.propertyWilLChange()` which you should call just
+ reason you can't directly watch a property you can invoke this method
+ manually along with `Ember.propertyWilLChange()` which you should call just
before the property value changes.
-
+
+ @memberOf Ember
+
@param {Object} obj
The object with the property that will change
-
+
@param {String} keyName
The property key (or path) that will change.
-
+
@returns {void}
*/
-var propertyDidChange = Ember.propertyDidChange = function(obj, keyName) {
+function propertyDidChange(obj, keyName) {
var m = meta(obj, false), proto = m.proto, desc = m.descs[keyName];
if (proto === obj) return ;
if (desc && desc.didChange) desc.didChange(obj, keyName);
dependentKeysDidChange(obj, keyName, m);
chainsDidChange(obj, keyName, m);
Ember.notifyObservers(obj, keyName);
-};
+}
-var NODE_STACK = []
+Ember.propertyDidChange = propertyDidChange;
+var NODE_STACK = [];
+
/**
Tears down the meta on an object so that it can be garbage collected.
Multiple calls will have no effect.
-
+
@param {Object} obj the object to destroy
@returns {void}
*/
Ember.destroy = function (obj) {
var meta = obj[META_KEY], node, nodes, key, nodeObject;
@@ -3850,34 +4534,869 @@
}
}
}
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
+// Project: Ember Metal
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals ember_assert */
+var o_create = Ember.platform.create;
+var meta = Ember.meta;
+var guidFor = Ember.guidFor;
+var a_slice = Array.prototype.slice;
+
+/**
+ The event system uses a series of nested hashes to store listeners on an
+ object. When a listener is registered, or when an event arrives, these
+ hashes are consulted to determine which target and action pair to invoke.
+
+ The hashes are stored in the object's meta hash, and look like this:
+
+ // Object's meta hash
+ {
+ listeners: { // variable name: `listenerSet`
+ "foo:changed": { // variable name: `targetSet`
+ [targetGuid]: { // variable name: `actionSet`
+ [methodGuid]: { // variable name: `action`
+ target: [Object object],
+ method: [Function function],
+ xform: [Function function]
+ }
+ }
+ }
+ }
+ }
+
+*/
+
+/** @private */
+var metaPath = Ember.metaPath;
+
+// Gets the set of all actions, keyed on the guid of each action's
+// method property.
+/** @private */
+function actionSetFor(obj, eventName, target, writable) {
+ var targetGuid = guidFor(target);
+ return metaPath(obj, ['listeners', eventName, targetGuid], writable);
+}
+
+// Gets the set of all targets, keyed on the guid of each action's
+// target property.
+/** @private */
+function targetSetFor(obj, eventName) {
+ var listenerSet = meta(obj, false).listeners;
+ if (!listenerSet) { return false; }
+
+ return listenerSet[eventName] || false;
+}
+
+// TODO: This knowledge should really be a part of the
+// meta system.
+var SKIP_PROPERTIES = { __ember_source__: true };
+
+/** @private */
+function iterateSet(targetSet, callback, params) {
+ if (!targetSet) { return false; }
+ // Iterate through all elements of the target set
+ for(var targetGuid in targetSet) {
+ if (SKIP_PROPERTIES[targetGuid]) { continue; }
+
+ var actionSet = targetSet[targetGuid];
+ if (actionSet) {
+ // Iterate through the elements of the action set
+ for(var methodGuid in actionSet) {
+ if (SKIP_PROPERTIES[methodGuid]) { continue; }
+
+ var action = actionSet[methodGuid];
+ if (action) {
+ if (callback(action, params) === true) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+}
+
+/** @private */
+function invokeAction(action, params) {
+ var method = action.method, target = action.target, xform = action.xform;
+ // If there is no target, the target is the object
+ // on which the event was fired.
+ if (!target) { target = params[0]; }
+ if ('string' === typeof method) { method = target[method]; }
+
+ // Listeners can provide an `xform` function, which can perform
+ // arbitrary transformations, such as changing the order of
+ // parameters.
+ //
+ // This is primarily used by ember-runtime's observer system, which
+ // provides a higher level abstraction on top of events, including
+ // dynamically looking up current values and passing them into the
+ // registered listener.
+ if (xform) {
+ xform(target, method, params);
+ } else {
+ method.apply(target, params);
+ }
+}
+
+/**
+ The parameters passed to an event listener are not exactly the
+ parameters passed to an observer. if you pass an xform function, it will
+ be invoked and is able to translate event listener parameters into the form
+ that observers are expecting.
+
+ @memberOf Ember
+*/
+function addListener(obj, eventName, target, method, xform) {
+ ember_assert("You must pass at least an object and event name to Ember.addListener", !!obj && !!eventName);
+
+ if (!method && 'function' === typeof target) {
+ method = target;
+ target = null;
+ }
+
+ var actionSet = actionSetFor(obj, eventName, target, true),
+ methodGuid = guidFor(method), ret;
+
+ if (!actionSet[methodGuid]) {
+ actionSet[methodGuid] = { target: target, method: method, xform: xform };
+ } else {
+ actionSet[methodGuid].xform = xform; // used by observers etc to map params
+ }
+
+ if ('function' === typeof obj.didAddListener) {
+ obj.didAddListener(eventName, target, method);
+ }
+
+ return ret; // return true if this is the first listener.
+}
+
+/** @memberOf Ember */
+function removeListener(obj, eventName, target, method) {
+ if (!method && 'function'===typeof target) {
+ method = target;
+ target = null;
+ }
+
+ var actionSet = actionSetFor(obj, eventName, target, true),
+ methodGuid = guidFor(method);
+
+ // we can't simply delete this parameter, because if we do, we might
+ // re-expose the property from the prototype chain.
+ if (actionSet && actionSet[methodGuid]) { actionSet[methodGuid] = null; }
+
+ if (obj && 'function'===typeof obj.didRemoveListener) {
+ obj.didRemoveListener(eventName, target, method);
+ }
+}
+
+// Suspend listener during callback.
+//
+// This should only be used by the target of the event listener
+// when it is taking an action that would cause the event, e.g.
+// an object might suspend its property change listener while it is
+// setting that property.
+/** @private */
+function suspendListener(obj, eventName, target, method, callback) {
+ if (!method && 'function' === typeof target) {
+ method = target;
+ target = null;
+ }
+
+ var actionSet = actionSetFor(obj, eventName, target, true),
+ methodGuid = guidFor(method),
+ action = actionSet && actionSet[methodGuid];
+
+ actionSet[methodGuid] = null;
+ try {
+ return callback.call(target);
+ } finally {
+ actionSet[methodGuid] = action;
+ }
+}
+
+// returns a list of currently watched events
+/** @memberOf Ember */
+function watchedEvents(obj) {
+ var listeners = meta(obj, false).listeners, ret = [];
+
+ if (listeners) {
+ for(var eventName in listeners) {
+ if (!SKIP_PROPERTIES[eventName] && listeners[eventName]) {
+ ret.push(eventName);
+ }
+ }
+ }
+ return ret;
+}
+
+/** @memberOf Ember */
+function sendEvent(obj, eventName) {
+
+ // first give object a chance to handle it
+ if (obj !== Ember && 'function' === typeof obj.sendEvent) {
+ obj.sendEvent.apply(obj, a_slice.call(arguments, 1));
+ }
+
+ var targetSet = targetSetFor(obj, eventName);
+ iterateSet(targetSet, invokeAction, arguments);
+
+ return true;
+}
+
+/** @memberOf Ember */
+function deferEvent(obj, eventName) {
+ var targetSet = targetSetFor(obj, eventName), actions = [], params = arguments;
+ iterateSet(targetSet, function (action) {
+ actions.push(action);
+ });
+
+ return function() {
+ if (obj !== Ember && 'function' === typeof obj.sendEvent) {
+ obj.sendEvent.apply(obj, a_slice.call(params, 1));
+ }
+
+ for (var i=0, len=actions.length; i < len; ++i) {
+ invokeAction(actions[i], params);
+ }
+ };
+}
+
+/** @memberOf Ember */
+function hasListeners(obj, eventName) {
+ var targetSet = targetSetFor(obj, eventName);
+ if (iterateSet(targetSet, function () {return true;})) {
+ return true;
+ }
+
+ // no listeners! might as well clean this up so it is faster later.
+ var set = metaPath(obj, ['listeners'], true);
+ set[eventName] = null;
+
+ return false;
+}
+
+/** @memberOf Ember */
+function listenersFor(obj, eventName) {
+ var targetSet = targetSetFor(obj, eventName), ret = [];
+ iterateSet(targetSet, function (action) {
+ ret.push([action.target, action.method]);
+ });
+ return ret;
+}
+
+Ember.addListener = addListener;
+Ember.removeListener = removeListener;
+Ember._suspendListener = suspendListener;
+Ember.sendEvent = sendEvent;
+Ember.hasListeners = hasListeners;
+Ember.watchedEvents = watchedEvents;
+Ember.listenersFor = listenersFor;
+Ember.deferEvent = deferEvent;
+})();
+
+
+
+(function() {
+// ==========================================================================
// Project: Ember Runtime
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var Mixin, MixinDelegate, REQUIRED, Alias;
+var classToString, superClassString;
+
+var a_map = Ember.ArrayUtils.map;
+var a_indexOf = Ember.ArrayUtils.indexOf;
+var a_forEach = Ember.ArrayUtils.forEach;
+var a_slice = Array.prototype.slice;
+var EMPTY_META = {}; // dummy for non-writable meta
+var META_SKIP = { __emberproto__: true, __ember_count__: true };
+
+var o_create = Ember.platform.create;
+
+/** @private */
+function meta(obj, writable) {
+ var m = Ember.meta(obj, writable!==false), ret = m.mixins;
+ if (writable===false) return ret || EMPTY_META;
+
+ if (!ret) {
+ ret = m.mixins = { __emberproto__: obj };
+ } else if (ret.__emberproto__ !== obj) {
+ ret = m.mixins = o_create(ret);
+ ret.__emberproto__ = obj;
+ }
+ return ret;
+}
+
+/** @private */
+function initMixin(mixin, args) {
+ if (args && args.length > 0) {
+ mixin.mixins = a_map(args, function(x) {
+ if (x instanceof Mixin) return x;
+
+ // Note: Manually setup a primitive mixin here. This is the only
+ // way to actually get a primitive mixin. This way normal creation
+ // of mixins will give you combined mixins...
+ var mixin = new Mixin();
+ mixin.properties = x;
+ return mixin;
+ });
+ }
+ return mixin;
+}
+
+var NATIVES = [Boolean, Object, Number, Array, Date, String];
+/** @private */
+function isMethod(obj) {
+ if ('function' !== typeof obj || obj.isMethod===false) return false;
+ return a_indexOf(NATIVES, obj)<0;
+}
+
+/** @private */
+function mergeMixins(mixins, m, descs, values, base) {
+ var len = mixins.length, idx, mixin, guid, props, value, key, ovalue, concats;
+
+ /** @private */
+ function removeKeys(keyName) {
+ delete descs[keyName];
+ delete values[keyName];
+ }
+
+ for(idx=0;idx<len;idx++) {
+
+ mixin = mixins[idx];
+ if (!mixin) throw new Error('Null value found in Ember.mixin()');
+
+ if (mixin instanceof Mixin) {
+ guid = Ember.guidFor(mixin);
+ if (m[guid]) continue;
+ m[guid] = mixin;
+ props = mixin.properties;
+ } else {
+ props = mixin; // apply anonymous mixin properties
+ }
+
+ if (props) {
+
+ // reset before adding each new mixin to pickup concats from previous
+ concats = values.concatenatedProperties || base.concatenatedProperties;
+ if (props.concatenatedProperties) {
+ concats = concats ? concats.concat(props.concatenatedProperties) : props.concatenatedProperties;
+ }
+
+ for (key in props) {
+ if (!props.hasOwnProperty(key)) continue;
+ value = props[key];
+ if (value instanceof Ember.Descriptor) {
+ if (value === REQUIRED && descs[key]) { continue; }
+
+ descs[key] = value;
+ values[key] = undefined;
+ } else {
+
+ // impl super if needed...
+ if (isMethod(value)) {
+ ovalue = (descs[key] === Ember.SIMPLE_PROPERTY) && values[key];
+ if (!ovalue) ovalue = base[key];
+ if ('function' !== typeof ovalue) ovalue = null;
+ if (ovalue) {
+ var o = value.__ember_observes__, ob = value.__ember_observesBefore__;
+ value = Ember.wrap(value, ovalue);
+ value.__ember_observes__ = o;
+ value.__ember_observesBefore__ = ob;
+ }
+ } else if ((concats && a_indexOf(concats, key)>=0) || key === 'concatenatedProperties') {
+ var baseValue = values[key] || base[key];
+ value = baseValue ? baseValue.concat(value) : Ember.makeArray(value);
+ }
+
+ descs[key] = Ember.SIMPLE_PROPERTY;
+ values[key] = value;
+ }
+ }
+
+ // manually copy toString() because some JS engines do not enumerate it
+ if (props.hasOwnProperty('toString')) {
+ base.toString = props.toString;
+ }
+
+ } else if (mixin.mixins) {
+ mergeMixins(mixin.mixins, m, descs, values, base);
+ if (mixin._without) a_forEach(mixin._without, removeKeys);
+ }
+ }
+}
+
+/** @private */
+var defineProperty = Ember.defineProperty;
+
+/** @private */
+function writableReq(obj) {
+ var m = Ember.meta(obj), req = m.required;
+ if (!req || (req.__emberproto__ !== obj)) {
+ req = m.required = req ? o_create(req) : { __ember_count__: 0 };
+ req.__emberproto__ = obj;
+ }
+ return req;
+}
+
+/** @private */
+function getObserverPaths(value) {
+ return ('function' === typeof value) && value.__ember_observes__;
+}
+
+/** @private */
+function getBeforeObserverPaths(value) {
+ return ('function' === typeof value) && value.__ember_observesBefore__;
+}
+
+Ember._mixinBindings = function(obj, key, value, m) {
+ return value;
+};
+
+/** @private */
+function applyMixin(obj, mixins, partial) {
+ var descs = {}, values = {}, m = Ember.meta(obj), req = m.required;
+ var key, willApply, didApply, value, desc;
+
+ var mixinBindings = Ember._mixinBindings;
+
+ // Go through all mixins and hashes passed in, and:
+ //
+ // * Handle concatenated properties
+ // * Set up _super wrapping if necessary
+ // * Set up descriptors (simple, watched or computed properties)
+ // * Copying `toString` in broken browsers
+ mergeMixins(mixins, meta(obj), descs, values, obj);
+
+ if (MixinDelegate.detect(obj)) {
+ willApply = values.willApplyProperty || obj.willApplyProperty;
+ didApply = values.didApplyProperty || obj.didApplyProperty;
+ }
+
+ for(key in descs) {
+ if (!descs.hasOwnProperty(key)) continue;
+
+ desc = descs[key];
+ value = values[key];
+
+ if (desc === REQUIRED) {
+ if (!(key in obj)) {
+ if (!partial) throw new Error('Required property not defined: '+key);
+
+ // for partial applies add to hash of required keys
+ req = writableReq(obj);
+ req.__ember_count__++;
+ req[key] = true;
+ }
+
+ } else {
+
+ while (desc instanceof Alias) {
+
+ var altKey = desc.methodName;
+ if (descs[altKey]) {
+ value = values[altKey];
+ desc = descs[altKey];
+ } else if (m.descs[altKey]) {
+ desc = m.descs[altKey];
+ value = desc.val(obj, altKey);
+ } else {
+ value = obj[altKey];
+ desc = Ember.SIMPLE_PROPERTY;
+ }
+ }
+
+ if (willApply) willApply.call(obj, key);
+
+ var observerPaths = getObserverPaths(value),
+ curObserverPaths = observerPaths && getObserverPaths(obj[key]),
+ beforeObserverPaths = getBeforeObserverPaths(value),
+ curBeforeObserverPaths = beforeObserverPaths && getBeforeObserverPaths(obj[key]),
+ len, idx;
+
+ if (curObserverPaths) {
+ len = curObserverPaths.length;
+ for(idx=0;idx<len;idx++) {
+ Ember.removeObserver(obj, curObserverPaths[idx], null, key);
+ }
+ }
+
+ if (curBeforeObserverPaths) {
+ len = curBeforeObserverPaths.length;
+ for(idx=0;idx<len;idx++) {
+ Ember.removeBeforeObserver(obj, curBeforeObserverPaths[idx], null,key);
+ }
+ }
+
+ // TODO: less hacky way for ember-runtime to add bindings.
+ value = mixinBindings(obj, key, value, m);
+
+ defineProperty(obj, key, desc, value);
+
+ if (observerPaths) {
+ len = observerPaths.length;
+ for(idx=0;idx<len;idx++) {
+ Ember.addObserver(obj, observerPaths[idx], null, key);
+ }
+ }
+
+ if (beforeObserverPaths) {
+ len = beforeObserverPaths.length;
+ for(idx=0;idx<len;idx++) {
+ Ember.addBeforeObserver(obj, beforeObserverPaths[idx], null, key);
+ }
+ }
+
+ if (req && req[key]) {
+ req = writableReq(obj);
+ req.__ember_count__--;
+ req[key] = false;
+ }
+
+ if (didApply) didApply.call(obj, key);
+
+ }
+ }
+
+ // Make sure no required attrs remain
+ if (!partial && req && req.__ember_count__>0) {
+ var keys = [];
+ for(key in req) {
+ if (META_SKIP[key]) continue;
+ keys.push(key);
+ }
+ throw new Error('Required properties not defined: '+keys.join(','));
+ }
+ return obj;
+}
+
+Ember.mixin = function(obj) {
+ var args = a_slice.call(arguments, 1);
+ return applyMixin(obj, args, false);
+};
+
+
+/**
+ @constructor
+*/
+Ember.Mixin = function() { return initMixin(this, arguments); };
+
+/** @private */
+Mixin = Ember.Mixin;
+
+/** @private */
+Mixin._apply = applyMixin;
+
+Mixin.applyPartial = function(obj) {
+ var args = a_slice.call(arguments, 1);
+ return applyMixin(obj, args, true);
+};
+
+Mixin.create = function() {
+ classToString.processed = false;
+ var M = this;
+ return initMixin(new M(), arguments);
+};
+
+Mixin.prototype.reopen = function() {
+
+ var mixin, tmp;
+
+ if (this.properties) {
+ mixin = Mixin.create();
+ mixin.properties = this.properties;
+ delete this.properties;
+ this.mixins = [mixin];
+ }
+
+ var len = arguments.length, mixins = this.mixins, idx;
+
+ for(idx=0;idx<len;idx++) {
+ mixin = arguments[idx];
+ if (mixin instanceof Mixin) {
+ mixins.push(mixin);
+ } else {
+ tmp = Mixin.create();
+ tmp.properties = mixin;
+ mixins.push(tmp);
+ }
+ }
+
+ return this;
+};
+
+var TMP_ARRAY = [];
+Mixin.prototype.apply = function(obj) {
+ TMP_ARRAY[0] = this;
+ var ret = applyMixin(obj, TMP_ARRAY, false);
+ TMP_ARRAY.length=0;
+ return ret;
+};
+
+Mixin.prototype.applyPartial = function(obj) {
+ TMP_ARRAY[0] = this;
+ var ret = applyMixin(obj, TMP_ARRAY, true);
+ TMP_ARRAY.length=0;
+ return ret;
+};
+
+/** @private */
+function _detect(curMixin, targetMixin, seen) {
+ var guid = Ember.guidFor(curMixin);
+
+ if (seen[guid]) return false;
+ seen[guid] = true;
+
+ if (curMixin === targetMixin) return true;
+ var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
+ while(--loc >= 0) {
+ if (_detect(mixins[loc], targetMixin, seen)) return true;
+ }
+ return false;
+}
+
+Mixin.prototype.detect = function(obj) {
+ if (!obj) return false;
+ if (obj instanceof Mixin) return _detect(obj, this, {});
+ return !!meta(obj, false)[Ember.guidFor(this)];
+};
+
+Mixin.prototype.without = function() {
+ var ret = new Mixin(this);
+ ret._without = a_slice.call(arguments);
+ return ret;
+};
+
+/** @private */
+function _keys(ret, mixin, seen) {
+ if (seen[Ember.guidFor(mixin)]) return;
+ seen[Ember.guidFor(mixin)] = true;
+
+ if (mixin.properties) {
+ var props = mixin.properties;
+ for(var key in props) {
+ if (props.hasOwnProperty(key)) ret[key] = true;
+ }
+ } else if (mixin.mixins) {
+ a_forEach(mixin.mixins, function(x) { _keys(ret, x, seen); });
+ }
+}
+
+Mixin.prototype.keys = function() {
+ var keys = {}, seen = {}, ret = [];
+ _keys(keys, this, seen);
+ for(var key in keys) {
+ if (keys.hasOwnProperty(key)) ret.push(key);
+ }
+ return ret;
+};
+
+/** @private - make Mixin's have nice displayNames */
+
+var NAME_KEY = Ember.GUID_KEY+'_name';
+var get = Ember.get;
+
+/** @private */
+function processNames(paths, root, seen) {
+ var idx = paths.length;
+ for(var key in root) {
+ if (!root.hasOwnProperty || !root.hasOwnProperty(key)) continue;
+ var obj = root[key];
+ paths[idx] = key;
+
+ if (obj && obj.toString === classToString) {
+ obj[NAME_KEY] = paths.join('.');
+ } else if (obj && get(obj, 'isNamespace')) {
+ if (seen[Ember.guidFor(obj)]) continue;
+ seen[Ember.guidFor(obj)] = true;
+ processNames(paths, obj, seen);
+ }
+
+ }
+ paths.length = idx; // cut out last item
+}
+
+/** @private */
+function findNamespaces() {
+ var Namespace = Ember.Namespace, obj;
+
+ if (Namespace.PROCESSED) { return; }
+
+ for (var prop in window) {
+ // get(window.globalStorage, 'isNamespace') would try to read the storage for domain isNamespace and cause exception in Firefox.
+ // globalStorage is a storage obsoleted by the WhatWG storage specification. See https://developer.mozilla.org/en/DOM/Storage#globalStorage
+ if (prop === "globalStorage" && window.StorageList && window.globalStorage instanceof window.StorageList) { continue; }
+ // Unfortunately, some versions of IE don't support window.hasOwnProperty
+ if (window.hasOwnProperty && !window.hasOwnProperty(prop)) { continue; }
+
+ try {
+ obj = window[prop];
+ } catch (e) {
+ continue;
+ }
+
+ if (obj && get(obj, 'isNamespace')) {
+ ember_deprecate("Namespaces should not begin with lowercase.", /^[A-Z]/.test(prop));
+ obj[NAME_KEY] = prop;
+ }
+ }
+}
+
+Ember.identifyNamespaces = findNamespaces;
+
+/** @private */
+superClassString = function(mixin) {
+ var superclass = mixin.superclass;
+ if (superclass) {
+ if (superclass[NAME_KEY]) { return superclass[NAME_KEY]; }
+ else { return superClassString(superclass); }
+ } else {
+ return;
+ }
+};
+
+/** @private */
+classToString = function() {
+ var Namespace = Ember.Namespace, namespace;
+
+ // TODO: Namespace should really be in Metal
+ if (Namespace) {
+ if (!this[NAME_KEY] && !classToString.processed) {
+ if (!Namespace.PROCESSED) {
+ findNamespaces();
+ Namespace.PROCESSED = true;
+ }
+
+ classToString.processed = true;
+
+ var namespaces = Namespace.NAMESPACES;
+ for (var i=0, l=namespaces.length; i<l; i++) {
+ namespace = namespaces[i];
+ processNames([namespace.toString()], namespace, {});
+ }
+ }
+ }
+
+ if (this[NAME_KEY]) {
+ return this[NAME_KEY];
+ } else {
+ var str = superClassString(this);
+ if (str) {
+ return "(subclass of " + str + ")";
+ } else {
+ return "(unknown mixin)";
+ }
+ }
+};
+
+Mixin.prototype.toString = classToString;
+
+// returns the mixins currently applied to the specified object
+// TODO: Make Ember.mixin
+Mixin.mixins = function(obj) {
+ var ret = [], mixins = meta(obj, false), key, mixin;
+ for(key in mixins) {
+ if (META_SKIP[key]) continue;
+ mixin = mixins[key];
+
+ // skip primitive mixins since these are always anonymous
+ if (!mixin.properties) ret.push(mixins[key]);
+ }
+ return ret;
+};
+
+REQUIRED = new Ember.Descriptor();
+REQUIRED.toString = function() { return '(Required Property)'; };
+
+Ember.required = function() {
+ return REQUIRED;
+};
+
+/** @private */
+Alias = function(methodName) {
+ this.methodName = methodName;
+};
+Alias.prototype = new Ember.Descriptor();
+
+Ember.alias = function(methodName) {
+ return new Alias(methodName);
+};
+
+Ember.MixinDelegate = Mixin.create({
+
+ willApplyProperty: Ember.required(),
+ didApplyProperty: Ember.required()
+
+});
+
+/** @private */
+MixinDelegate = Ember.MixinDelegate;
+
+
+// ..........................................................
+// OBSERVER HELPER
+//
+
+Ember.observer = function(func) {
+ var paths = a_slice.call(arguments, 1);
+ func.__ember_observes__ = paths;
+ return func;
+};
+
+Ember.beforeObserver = function(func) {
+ var paths = a_slice.call(arguments, 1);
+ func.__ember_observesBefore__ = paths;
+ return func;
+};
+
+
+
+
+
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2010 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
/*globals ember_assert */
// Ember.Logger
// Ember.watch.flushPending
// Ember.beginPropertyChanges, Ember.endPropertyChanges
// Ember.guidFor
+// Ember.ArrayUtils
// ..........................................................
// HELPERS
//
var slice = Array.prototype.slice;
+var forEach = Ember.ArrayUtils.forEach;
// invokes passed params - normalizing so you can pass target/func,
// target/string or just func
+/** @private */
function invoke(target, method, args, ignore) {
if (method===undefined) {
method = target;
target = undefined;
@@ -3908,11 +5427,14 @@
// RUNLOOP
//
var timerMark; // used by timers...
+/** @private */
var K = function() {};
+
+/** @private */
var RunLoop = function(prev) {
var self;
if (this instanceof RunLoop) {
self = this;
@@ -3965,21 +5487,28 @@
if (queueName) {
while (this._queues && (queue = this._queues[queueName])) {
this._queues[queueName] = null;
- log = Ember.LOG_BINDINGS && queueName==='sync';
- if (log) Ember.Logger.log('Begin: Flush Sync Queue');
-
- // the sync phase is to allow property changes to propogate. don't
+ // the sync phase is to allow property changes to propagate. don't
// invoke observers until that is finished.
- if (queueName === 'sync') Ember.beginPropertyChanges();
- queue.forEach(iter);
- if (queueName === 'sync') Ember.endPropertyChanges();
+ if (queueName === 'sync') {
+ log = Ember.LOG_BINDINGS;
+ if (log) Ember.Logger.log('Begin: Flush Sync Queue');
- if (log) Ember.Logger.log('End: Flush Sync Queue');
+ Ember.beginPropertyChanges();
+ try {
+ forEach(queue, iter);
+ } finally {
+ Ember.endPropertyChanges();
+ }
+ if (log) Ember.Logger.log('End: Flush Sync Queue');
+
+ } else {
+ forEach(queue, iter);
+ }
}
} else {
queueNames = Ember.run.queues;
len = queueNames.length;
@@ -3987,21 +5516,30 @@
this._queues = null;
for(idx=0;idx<len;idx++) {
queueName = queueNames[idx];
queue = queues[queueName];
- log = Ember.LOG_BINDINGS && queueName==='sync';
- if (log) Ember.Logger.log('Begin: Flush Sync Queue');
+ if (queue) {
+ // the sync phase is to allow property changes to propagate. don't
+ // invoke observers until that is finished.
+ if (queueName === 'sync') {
+ log = Ember.LOG_BINDINGS;
+ if (log) Ember.Logger.log('Begin: Flush Sync Queue');
- if (queueName === 'sync') Ember.beginPropertyChanges();
- if (queue) queue.forEach(iter);
- if (queueName === 'sync') Ember.endPropertyChanges();
+ Ember.beginPropertyChanges();
+ try {
+ forEach(queue, iter);
+ } finally {
+ Ember.endPropertyChanges();
+ }
- if (log) Ember.Logger.log('End: Flush Sync Queue');
-
+ if (log) Ember.Logger.log('End: Flush Sync Queue');
+ } else {
+ forEach(queue, iter);
+ }
+ }
}
-
} while (queues = this._queues); // go until queues stay clean
}
timerMark = null;
@@ -4013,24 +5551,32 @@
Ember.RunLoop = RunLoop;
// ..........................................................
// Ember.run - this is ideally the only public API the dev sees
//
+/**
+* @namespace Ember.run is both a function and a namespace for
+* RunLoop-related functions.
+* @name Ember.run
+*/
-var run;
-
/**
- Runs the passed target and method inside of a runloop, ensuring any
+ Runs the passed target and method inside of a RunLoop, ensuring any
deferred actions including bindings and views updates are flushed at the
end.
Normally you should not need to invoke this method yourself. However if
you are implementing raw event handlers when interfacing with other
libraries or plugins, you should probably wrap all of your code inside this
call.
- @function
+ Ember.run(function(){
+ // code to be execute within a RunLoop
+ });
+
+ @name run^2
+ @methodOf Ember.run
@param {Object} target
(Optional) target of method to call
@param {Function|String} method
Method to invoke. May be a function or a string. If you pass a string
@@ -4039,11 +5585,11 @@
@param {Object...} args
Any additional arguments you wish to pass to the method.
@returns {Object} return value from invoking the passed function.
*/
-Ember.run = run = function(target, method) {
+Ember.run = function(target, method) {
var ret, loop;
run.begin();
try {
if (target || method) ret = invoke(target, method, arguments, 2);
@@ -4051,15 +5597,24 @@
run.end();
}
return ret;
};
+/** @private */
+var run = Ember.run;
+
+
/**
Begins a new RunLoop. Any deferred actions invoked after the begin will
be buffered until you invoke a matching call to Ember.run.end(). This is
an lower-level way to use a RunLoop instead of using Ember.run().
+ Ember.run.begin();
+ // code to be execute within a RunLoop
+ Ember.run.end();
+
+
@returns {void}
*/
Ember.run.begin = function() {
run.currentRunLoop = new RunLoop(run.currentRunLoop);
};
@@ -4067,10 +5622,14 @@
/**
Ends a RunLoop. This must be called sometime after you call Ember.run.begin()
to flush any deferred actions. This is a lower-level way to use a RunLoop
instead of using Ember.run().
+ Ember.run.begin();
+ // code to be execute within a RunLoop
+ Ember.run.end();
+
@returns {void}
*/
Ember.run.end = function() {
ember_assert('must have a current run loop', run.currentRunLoop);
try {
@@ -4086,10 +5645,11 @@
are flushed at the end of the RunLoop. You can define your own queues by
simply adding the queue name to this array. Normally you should not need
to inspect or modify this property.
@property {String}
+ @default ['sync', 'actions', 'destroy', 'timers']
*/
Ember.run.queues = ['sync', 'actions', 'destroy', 'timers'];
/**
Adds the passed target/method and any optional arguments to the named
@@ -4099,10 +5659,22 @@
At the end of a RunLoop, any methods scheduled in this way will be invoked.
Methods will be invoked in an order matching the named queues defined in
the run.queues property.
+ Ember.run.schedule('timers', this, function(){
+ // this will be executed at the end of the RunLoop, when timers are run
+ console.log("scheduled on timers queue");
+ });
+ Ember.run.schedule('sync', this, function(){
+ // this will be executed at the end of the RunLoop, when bindings are synced
+ console.log("scheduled on sync queue");
+ });
+ // Note the functions will be run in order based on the run queues order. Output would be:
+ // scheduled on sync queue
+ // scheduled on timers queue
+
@param {String} queue
The name of the queue to schedule against. Default queues are 'sync' and
'actions'
@param {Object} target
@@ -4123,10 +5695,11 @@
loop.schedule.apply(loop, arguments);
};
var autorunTimer;
+/** @private */
function autorun() {
autorunTimer = null;
if (run.currentRunLoop) run.end();
}
@@ -4134,10 +5707,12 @@
Begins a new RunLoop if necessary and schedules a timer to flush the
RunLoop at a later time. This method is used by parts of Ember to
ensure the RunLoop always finishes. You normally do not need to call this
method directly. Instead use Ember.run().
+ Ember.run.autorun();
+
@returns {Ember.RunLoop} the new current RunLoop
*/
Ember.run.autorun = function() {
if (!run.currentRunLoop) {
@@ -4157,13 +5732,15 @@
/**
Immediately flushes any events scheduled in the 'sync' queue. Bindings
use this queue so this method is a useful way to immediately force all
bindings in the application to sync.
- You should call this method anytime you need any changed state to propogate
+ You should call this method anytime you need any changed state to propagate
throughout the app immediately without repainting the UI.
+ Ember.run.sync();
+
@returns {void}
*/
Ember.run.sync = function() {
run.autorun();
run.currentRunLoop.flush('sync');
@@ -4174,10 +5751,11 @@
//
var timers = {}; // active timers...
var laterScheduled = false;
+/** @private */
function invokeLaterTimers() {
var now = (+ new Date()), earliest = -1;
for(var key in timers) {
if (!timers.hasOwnProperty(key)) continue;
var timer = timers[key];
@@ -4199,14 +5777,18 @@
Invokes the passed target/method and optional arguments after a specified
period if time. The last parameter of this method must always be a number
of milliseconds.
You should use this method whenever you need to run some action after a
- period of time inside of using setTimeout(). This method will ensure that
+ period of time instead of using setTimeout(). This method will ensure that
items that expire during the same script execution cycle all execute
together, which is often more efficient than using a real setTimeout.
+ Ember.run.later(myContext, function(){
+ // code here will execute within a RunLoop in about 500ms with this == myContext
+ }, 500);
+
@param {Object} target
(optional) target of method to invoke
@param {Function|String} method
The method to invoke. If you pass a string it will be resolved on the
@@ -4241,10 +5823,11 @@
timers[guid] = timer;
run.once(timers, invokeLaterTimers);
return guid;
};
+/** @private */
function invokeOnceTimer(guid, onceTimers) {
if (onceTimers[this.tguid]) delete onceTimers[this.tguid][this.mguid];
if (timers[guid]) invoke(this.target, this.method, this.args, 2);
delete timers[guid];
}
@@ -4255,10 +5838,17 @@
Note that although you can pass optional arguments these will not be
considered when looking for duplicates. New arguments will replace previous
calls.
+ Ember.run(function(){
+ var doFoo = function() { foo(); }
+ Ember.run.once(myContext, doFoo);
+ Ember.run.once(myContext, doFoo);
+ // doFoo will only be executed once at the end of the RunLoop
+ });
+
@param {Object} target
(optional) target of method to invoke
@param {Function|String} method
The method to invoke. If you pass a string it will be resolved on the
@@ -4297,10 +5887,11 @@
return guid;
};
var scheduledNext = false;
+/** @private */
function invokeNextTimers() {
scheduledNext = null;
for(var key in timers) {
if (!timers.hasOwnProperty(key)) continue;
var timer = timers[key];
@@ -4313,10 +5904,14 @@
/**
Schedules an item to run after control has been returned to the system.
This is often equivalent to calling setTimeout(function...,1).
+ Ember.run.next(myContext, function(){
+ // code to be executed in the next RunLoop, which will be scheduled after the current one
+ });
+
@param {Object} target
(optional) target of method to invoke
@param {Function|String} method
The method to invoke. If you pass a string it will be resolved on the
@@ -4346,10 +5941,25 @@
/**
Cancels a scheduled item. Must be a value returned by `Ember.run.later()`,
`Ember.run.once()`, or `Ember.run.next()`.
+ var runNext = Ember.run.next(myContext, function(){
+ // will not be executed
+ });
+ Ember.run.cancel(runNext);
+
+ var runLater = Ember.run.next(myContext, function(){
+ // will not be executed
+ }, 500);
+ Ember.run.cancel(runLater);
+
+ var runOnce = Ember.run.once(myContext, function(){
+ // will not be executed
+ });
+ Ember.run.cancel(runOnce);
+
@param {Object} timer
Timer object to cancel
@returns {void}
*/
@@ -4360,38 +5970,38 @@
// ..........................................................
// DEPRECATED API
//
/**
- @namespace
+ @namespace Compatibility for Ember.run
@name Ember.RunLoop
@deprecated
- @description Compatibility for Ember.run
*/
/**
@deprecated
@method
Use `#js:Ember.run.begin()` instead
*/
-Ember.RunLoop.begin = Ember.run.begin;
+Ember.RunLoop.begin = ember_deprecateFunc("Use Ember.run.begin instead of Ember.RunLoop.begin.", Ember.run.begin);
/**
@deprecated
@method
Use `#js:Ember.run.end()` instead
*/
-Ember.RunLoop.end = Ember.run.end;
+Ember.RunLoop.end = ember_deprecateFunc("Use Ember.run.end instead of Ember.RunLoop.end.", Ember.run.end);
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -4413,11 +6023,11 @@
Debug parameter you can turn on. This will log all bindings that fire to
the console. This should be disabled in production code. Note that you
can also enable this from the console or temporarily.
@type Boolean
- @default NO
+ @default false
*/
Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
/**
@static
@@ -4464,18 +6074,20 @@
// ..........................................................
// TYPE COERCION HELPERS
//
// Coerces a non-array value into an array.
+/** @private */
function MULTIPLE(val) {
if (val instanceof Array) return val;
if (val === undefined || val === null) return [];
return [val];
}
// Treats a single-element array as the element. Otherwise
// returns a placeholder.
+/** @private */
function SINGLE(val, placeholder) {
if (val instanceof Array) {
if (val.length>1) return placeholder;
else return val[0];
}
@@ -4502,10 +6114,11 @@
setPath = Ember.setPath,
guidFor = Ember.guidFor,
isGlobalPath = Ember.isGlobalPath;
// Applies a binding's transformations against a value.
+/** @private */
function getTransformedValue(binding, val, obj, dir) {
// First run a type transform, if it exists, that changes the fundamental
// type of the value. For example, some transforms convert an array to a
// single object.
@@ -4523,18 +6136,21 @@
if (transform) { val = transform.call(this, val, obj); }
}
return val;
}
+/** @private */
function empty(val) {
return val===undefined || val===null || val==='' || (Ember.isArray(val) && get(val, 'length')===0) ;
}
+/** @private */
function getPathWithGlobals(obj, path) {
return getPath(isGlobalPath(path) ? window : obj, path);
}
+/** @private */
function getTransformedFromValue(obj, binding) {
var operation = binding._operation,
fromValue;
if (operation) {
fromValue = operation(obj, binding._from, binding._operand);
@@ -4542,44 +6158,49 @@
fromValue = getPathWithGlobals(obj, binding._from);
}
return getTransformedValue(binding, fromValue, obj, 'to');
}
+/** @private */
function getTransformedToValue(obj, binding) {
var toValue = getPath(obj, binding._to);
return getTransformedValue(binding, toValue, obj, 'from');
}
+/** @private */
var AND_OPERATION = function(obj, left, right) {
return getPathWithGlobals(obj, left) && getPathWithGlobals(obj, right);
};
+/** @private */
var OR_OPERATION = function(obj, left, right) {
return getPathWithGlobals(obj, left) || getPathWithGlobals(obj, right);
};
// ..........................................................
// BINDING
//
-
+/** @private */
var K = function() {};
+
+/** @private */
var Binding = function(toPath, fromPath) {
var self;
-
+
if (this instanceof Binding) {
self = this;
} else {
self = new K();
}
-
+
/** @private */
self._direction = 'fwd';
/** @private */
self._from = fromPath;
self._to = toPath;
-
+
return self;
};
K.prototype = Binding.prototype;
@@ -4605,11 +6226,11 @@
return this;
},
/**
This will set the "to" property path to the specified value. It will not
- attempt to reoslve this property path to an actual object until you
+ attempt to resolve this property path to an actual object until you
connect the binding.
The binding will search for the property path starting at the root object
you pass when you connect() the binding. It follows the same rules as
`getPath()` - see that method for more information.
@@ -4629,11 +6250,11 @@
means that if you change the "to" side directly, the "from" side may have
a different value.
@param {Boolean} flag
(Optional) passing nothing here will make the binding oneWay. You can
- instead pass NO to disable oneWay, making the binding two way again.
+ instead pass false to disable oneWay, making the binding two way again.
@returns {Ember.Binding} receiver
*/
oneWay: function(flag) {
this._oneWay = flag===undefined ? true : !!flag;
@@ -4721,12 +6342,12 @@
return this;
},
/**
Adds a transform to convert the value to a bool value. If the value is
- an array it will return YES if array is not empty. If the value is a
- string it will return YES if the string is not empty.
+ an array it will return true if array is not empty. If the value is a
+ string it will return true if the string is not empty.
@returns {Ember.Binding} this
*/
bool: function() {
this.transform(BOOL);
@@ -4739,15 +6360,14 @@
@param {Object} [placeholder] Placeholder value.
@returns {Ember.Binding} this
*/
notEmpty: function(placeholder) {
- // Display warning for users using the SproutCore 1.x-style API.
- ember_assert("notEmpty should only take a placeholder as a parameter. You no longer need to pass null as the first parameter.", arguments.length < 2);
+ if (placeholder === null || placeholder === undefined) {
+ placeholder = Ember.EMPTY_PLACEHOLDER;
+ }
- if (placeholder == undefined) { placeholder = Ember.EMPTY_PLACEHOLDER; }
-
this.transform({
to: function(val) { return empty(val) ? placeholder : val; }
});
return this;
@@ -4760,14 +6380,16 @@
@param {String} fromPath from path or null
@param {Object} [placeholder] Placeholder value.
@returns {Ember.Binding} this
*/
notNull: function(placeholder) {
- if (placeholder == undefined) { placeholder = Ember.EMPTY_PLACEHOLDER; }
+ if (placeholder === null || placeholder === undefined) {
+ placeholder = Ember.EMPTY_PLACEHOLDER;
+ }
this.transform({
- to: function(val) { return val == null ? placeholder : val; }
+ to: function(val) { return (val === null || val === undefined) ? placeholder : val; }
});
return this;
},
@@ -4781,16 +6403,16 @@
this.transform(NOT);
return this;
},
/**
- Adds a transform that will return YES if the value is null or undefined, NO otherwise.
+ Adds a transform that will return true if the value is null or undefined, false otherwise.
@returns {Ember.Binding} this
*/
isNull: function() {
- this.transform(function(val) { return val == null; });
+ this.transform(function(val) { return val === null || val === undefined; });
return this;
},
/** @private */
toString: function() {
@@ -4911,30 +6533,38 @@
var fromPath = this._from, toPath = this._to;
delete this[guid];
- // apply any operations to the object, then apply transforms
- var fromValue = getTransformedFromValue(obj, this);
- var toValue = getTransformedToValue(obj, this);
-
- if (toValue === fromValue) { return; }
-
// if we're synchronizing from the remote object...
if (direction === 'fwd') {
- if (log) { Ember.Logger.log(' ', this.toString(), toValue, '->', fromValue, obj); }
- Ember.trySetPath(Ember.isGlobalPath(toPath) ? window : obj, toPath, fromValue);
-
+ var fromValue = getTransformedFromValue(obj, this);
+ if (log) {
+ Ember.Logger.log(' ', this.toString(), '->', fromValue, obj);
+ }
+ if (this._oneWay) {
+ Ember.trySetPath(Ember.isGlobalPath(toPath) ? window : obj, toPath, fromValue);
+ } else {
+ Ember._suspendObserver(obj, toPath, this, this.toDidChange, function () {
+ Ember.trySetPath(Ember.isGlobalPath(toPath) ? window : obj, toPath, fromValue);
+ });
+ }
// if we're synchronizing *to* the remote object
} else if (direction === 'back') {// && !this._oneWay) {
- if (log) { Ember.Logger.log(' ', this.toString(), toValue, '<-', fromValue, obj); }
- Ember.trySetPath(Ember.isGlobalPath(fromPath) ? window : obj, fromPath, toValue);
+ var toValue = getTransformedToValue(obj, this);
+ if (log) {
+ Ember.Logger.log(' ', this.toString(), '<-', toValue, obj);
+ }
+ Ember._suspendObserver(obj, fromPath, this, this.fromDidChange, function () {
+ Ember.trySetPath(Ember.isGlobalPath(fromPath) ? window : obj, fromPath, toValue);
+ });
}
}
};
+/** @private */
function mixinProperties(to, from) {
for (var key in from) {
if (from.hasOwnProperty(key)) {
to[key] = from[key];
}
@@ -4969,13 +6599,13 @@
},
/**
@see Ember.Binding.prototype.single
*/
- single: function(from) {
+ single: function(from, placeholder) {
var C = this, binding = new C(null, from);
- return binding.single();
+ return binding.single(placeholder);
},
/**
@see Ember.Binding.prototype.multiple
*/
@@ -4985,12 +6615,16 @@
},
/**
@see Ember.Binding.prototype.transform
*/
- transform: function(func) {
- var C = this, binding = new C();
+ transform: function(from, func) {
+ if (!func) {
+ func = from;
+ from = null;
+ }
+ var C = this, binding = new C(null, from);
return binding.transform(func);
},
/**
@see Ember.Binding.prototype.notEmpty
@@ -4999,10 +6633,19 @@
var C = this, binding = new C(null, from);
return binding.notEmpty(placeholder);
},
/**
+ @see Ember.Binding.prototype.notNull
+ */
+ notNull: function(from, placeholder) {
+ var C = this, binding = new C(null, from);
+ return binding.notNull(placeholder);
+ },
+
+
+ /**
@see Ember.Binding.prototype.bool
*/
bool: function(from) {
var C = this, binding = new C(null, from);
return binding.bool();
@@ -5015,10 +6658,18 @@
var C = this, binding = new C(null, from);
return binding.not();
},
/**
+ @see Ember.Binding.prototype.isNull
+ */
+ isNull: function(from) {
+ var C = this, binding = new C(null, from);
+ return binding.isNull();
+ },
+
+ /**
Adds a transform that forwards the logical 'AND' of values at 'pathA' and
'pathB' whenever either source changes. Note that the transform acts
strictly as a one-way binding, working only in the direction
'pathA' AND 'pathB' --> value (value returned is the result of ('pathA' && 'pathB'))
@@ -5255,1057 +6906,878 @@
Ember.oneWay = function(obj, to, from) {
return new Ember.Binding(to, from).oneWay().connect(obj);
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Metal
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-/*globals ember_assert */
-var meta = Ember.meta;
-var guidFor = Ember.guidFor;
-var USE_ACCESSORS = Ember.USE_ACCESSORS;
-var a_slice = Array.prototype.slice;
-var o_create = Ember.platform.create;
-var o_defineProperty = Ember.platform.defineProperty;
-// ..........................................................
-// DEPENDENT KEYS
-//
+})();
-// data structure:
-// meta.deps = {
-// 'depKey': {
-// 'keyName': count,
-// __emberproto__: SRC_OBJ [to detect clones]
-// },
-// __emberproto__: SRC_OBJ
-// }
+(function() {
+/**
+ * @license
+ * ==========================================================================
+ * Ember
+ * Copyright ©2006-2011, Strobe Inc. and contributors.
+ * Portions copyright ©2008-2011 Apple Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * For more information about Ember, visit http://www.emberjs.com
+ *
+ * ==========================================================================
+ */
-function uniqDeps(obj, depKey) {
- var m = meta(obj), deps, ret;
- deps = m.deps;
- if (!deps) {
- deps = m.deps = { __emberproto__: obj };
- } else if (deps.__emberproto__ !== obj) {
- deps = m.deps = o_create(deps);
- deps.__emberproto__ = obj;
- }
-
- ret = deps[depKey];
- if (!ret) {
- ret = deps[depKey] = { __emberproto__: obj };
- } else if (ret.__emberproto__ !== obj) {
- ret = deps[depKey] = o_create(ret);
- ret.__emberproto__ = obj;
- }
-
- return ret;
-}
+})();
-function addDependentKey(obj, keyName, depKey) {
- var deps = uniqDeps(obj, depKey);
- deps[keyName] = (deps[keyName] || 0) + 1;
- Ember.watch(obj, depKey);
-}
-function removeDependentKey(obj, keyName, depKey) {
- var deps = uniqDeps(obj, depKey);
- deps[keyName] = (deps[keyName] || 0) - 1;
- Ember.unwatch(obj, depKey);
-}
-function addDependentKeys(desc, obj, keyName) {
- var keys = desc._dependentKeys,
- len = keys ? keys.length : 0;
- for(var idx=0;idx<len;idx++) addDependentKey(obj, keyName, keys[idx]);
-}
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals ENV ember_assert */
+var indexOf = Ember.ArrayUtils.indexOf;
-// ..........................................................
-// COMPUTED PROPERTY
+// ........................................
+// GLOBAL CONSTANTS
//
-function ComputedProperty(func, opts) {
- this.func = func;
- this._cacheable = opts && opts.cacheable;
- this._dependentKeys = opts && opts.dependentKeys;
+// ensure no undefined errors in browsers where console doesn't exist
+if (typeof console === 'undefined') {
+ window.console = {};
+ console.log = console.info = console.warn = console.error = function() {};
}
-/**
- @constructor
-*/
-Ember.ComputedProperty = ComputedProperty;
-ComputedProperty.prototype = new Ember.Descriptor();
-var CP_DESC = {
- configurable: true,
- enumerable: true,
- get: function() { return undefined; }, // for when use_accessors is false.
- set: Ember.Descriptor.MUST_USE_SETTER // for when use_accessors is false
-};
+// ........................................
+// TYPING & ARRAY MESSAGING
+//
-function mkCpGetter(keyName, desc) {
- var cacheable = desc._cacheable,
- func = desc.func;
-
- if (cacheable) {
- return function() {
- var ret, cache = meta(this).cache;
- if (keyName in cache) return cache[keyName];
- ret = cache[keyName] = func.call(this, keyName);
- return ret ;
- };
- } else {
- return function() {
- return func.call(this, keyName);
- };
- }
-}
+var TYPE_MAP = {};
+var t ="Boolean Number String Function Array Date RegExp Object".split(" ");
+Ember.ArrayUtils.forEach(t, function(name) {
+ TYPE_MAP[ "[object " + name + "]" ] = name.toLowerCase();
+});
-function mkCpSetter(keyName, desc) {
- var cacheable = desc._cacheable,
- func = desc.func;
-
- return function(value) {
- var m = meta(this, cacheable),
- watched = (m.source===this) && m.watching[keyName]>0,
- ret, oldSuspended, lastSetValues;
+var toString = Object.prototype.toString;
- oldSuspended = desc._suspended;
- desc._suspended = this;
-
- watched = watched && m.lastSetValues[keyName]!==guidFor(value);
- if (watched) {
- m.lastSetValues[keyName] = guidFor(value);
- Ember.propertyWillChange(this, keyName);
- }
-
- if (cacheable) delete m.cache[keyName];
- ret = func.call(this, keyName, value);
- if (cacheable) m.cache[keyName] = ret;
- if (watched) Ember.propertyDidChange(this, keyName);
- desc._suspended = oldSuspended;
- return ret;
- };
-}
-
/**
- @extends Ember.ComputedProperty
- @private
-*/
-var Cp = ComputedProperty.prototype;
+ Returns a consistent type for the passed item.
-/**
- Call on a computed property to set it into cacheable mode. When in this
- mode the computed property will automatically cache the return value of
- your function until one of the dependent keys changes.
+ Use this instead of the built-in Ember.typeOf() to get the type of an item.
+ It will return the same result across all browsers and includes a bit
+ more detail. Here is what will be returned:
- @param {Boolean} aFlag optional set to false to disable cacheing
- @returns {Ember.ComputedProperty} receiver
-*/
-Cp.cacheable = function(aFlag) {
- this._cacheable = aFlag!==false;
- return this;
-};
+ | Return Value | Meaning |
+ |---------------|------------------------------------------------------|
+ | 'string' | String primitive |
+ | 'number' | Number primitive |
+ | 'boolean' | Boolean primitive |
+ | 'null' | Null value |
+ | 'undefined' | Undefined value |
+ | 'function' | A function |
+ | 'array' | An instance of Array |
+ | 'class' | A Ember class (created using Ember.Object.extend()) |
+ | 'instance' | A Ember object instance |
+ | 'error' | An instance of the Error object |
+ | 'object' | A JavaScript object not inheriting from Ember.Object |
-/**
- Sets the dependent keys on this computed property. Pass any number of
- arguments containing key paths that this computed property depends on.
-
- @param {String} path... zero or more property paths
- @returns {Ember.ComputedProperty} receiver
-*/
-Cp.property = function() {
- this._dependentKeys = a_slice.call(arguments);
- return this;
-};
+ Examples:
-/** @private - impl descriptor API */
-Cp.setup = function(obj, keyName, value) {
- CP_DESC.get = mkCpGetter(keyName, this);
- CP_DESC.set = mkCpSetter(keyName, this);
- o_defineProperty(obj, keyName, CP_DESC);
- CP_DESC.get = CP_DESC.set = null;
- addDependentKeys(this, obj, keyName);
-};
+ Ember.typeOf(); => 'undefined'
+ Ember.typeOf(null); => 'null'
+ Ember.typeOf(undefined); => 'undefined'
+ Ember.typeOf('michael'); => 'string'
+ Ember.typeOf(101); => 'number'
+ Ember.typeOf(true); => 'boolean'
+ Ember.typeOf(Ember.makeArray); => 'function'
+ Ember.typeOf([1,2,90]); => 'array'
+ Ember.typeOf(Ember.Object.extend()); => 'class'
+ Ember.typeOf(Ember.Object.create()); => 'instance'
+ Ember.typeOf(new Error('teamocil')); => 'error'
-/** @private - impl descriptor API */
-Cp.teardown = function(obj, keyName) {
- var keys = this._dependentKeys,
- len = keys ? keys.length : 0;
- for(var idx=0;idx<len;idx++) removeDependentKey(obj, keyName, keys[idx]);
+ // "normal" JavaScript object
+ Ember.typeOf({a: 'b'}); => 'object'
- if (this._cacheable) delete meta(obj).cache[keyName];
-
- return null; // no value to restore
-};
+ @param item {Object} the item to check
+ @returns {String} the type
+*/
+Ember.typeOf = function(item) {
+ var ret;
-/** @private - impl descriptor API */
-Cp.didChange = function(obj, keyName) {
- if (this._cacheable && (this._suspended !== obj)) {
- delete meta(obj).cache[keyName];
- }
-};
+ ret = (item === null || item === undefined) ? String(item) : TYPE_MAP[toString.call(item)] || 'object';
-/** @private - impl descriptor API */
-Cp.get = function(obj, keyName) {
- var ret, cache;
-
- if (this._cacheable) {
- cache = meta(obj).cache;
- if (keyName in cache) return cache[keyName];
- ret = cache[keyName] = this.func.call(obj, keyName);
- } else {
- ret = this.func.call(obj, keyName);
+ if (ret === 'function') {
+ if (Ember.Object && Ember.Object.detect(item)) ret = 'class';
+ } else if (ret === 'object') {
+ if (item instanceof Error) ret = 'error';
+ else if (Ember.Object && item instanceof Ember.Object) ret = 'instance';
+ else ret = 'object';
}
- return ret ;
-};
-/** @private - impl descriptor API */
-Cp.set = function(obj, keyName, value) {
- var cacheable = this._cacheable;
-
- var m = meta(obj, cacheable),
- watched = (m.source===obj) && m.watching[keyName]>0,
- ret, oldSuspended, lastSetValues;
-
- oldSuspended = this._suspended;
- this._suspended = obj;
-
- watched = watched && m.lastSetValues[keyName]!==guidFor(value);
- if (watched) {
- m.lastSetValues[keyName] = guidFor(value);
- Ember.propertyWillChange(obj, keyName);
- }
-
- if (cacheable) delete m.cache[keyName];
- ret = this.func.call(obj, keyName, value);
- if (cacheable) m.cache[keyName] = ret;
- if (watched) Ember.propertyDidChange(obj, keyName);
- this._suspended = oldSuspended;
return ret;
};
-Cp.val = function(obj, keyName) {
- return meta(obj, false).values[keyName];
-};
+/**
+ Returns true if the passed value is null or undefined. This avoids errors
+ from JSLint complaining about use of ==, which can be technically
+ confusing.
-if (!Ember.platform.hasPropertyAccessors) {
- Cp.setup = function(obj, keyName, value) {
- obj[keyName] = undefined; // so it shows up in key iteration
- addDependentKeys(this, obj, keyName);
- };
-
-} else if (!USE_ACCESSORS) {
- Cp.setup = function(obj, keyName) {
- // throw exception if not using Ember.get() and Ember.set() when supported
- o_defineProperty(obj, keyName, CP_DESC);
- addDependentKeys(this, obj, keyName);
- };
-}
+ Ember.none(); => true
+ Ember.none(null); => true
+ Ember.none(undefined); => true
+ Ember.none(''); => false
+ Ember.none([]); => false
+ Ember.none(function(){}); => false
-/**
- This helper returns a new property descriptor that wraps the passed
- computed property function. You can use this helper to define properties
- with mixins or via Ember.defineProperty().
-
- The function you pass will be used to both get and set property values.
- The function should accept two parameters, key and value. If value is not
- undefined you should set the value first. In either case return the
- current value of the property.
-
- @param {Function} func
- The computed property function.
-
- @returns {Ember.ComputedProperty} property descriptor instance
+ @param {Object} obj Value to test
+ @returns {Boolean}
*/
-Ember.computed = function(func) {
- return new ComputedProperty(func);
+Ember.none = function(obj) {
+ return obj === null || obj === undefined;
};
-})({});
+/**
+ Verifies that a value is null or an empty string | array | function.
+ Constrains the rules on `Ember.none` by returning false for empty
+ string and empty arrays.
-(function(exports) {
-// ==========================================================================
-// Project: Ember Metal
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/*globals ember_assert */
-var o_create = Ember.platform.create;
-var meta = Ember.meta;
-var guidFor = Ember.guidFor;
-var array_Slice = Array.prototype.slice;
+ Ember.empty(); => true
+ Ember.empty(null); => true
+ Ember.empty(undefined); => true
+ Ember.empty(''); => true
+ Ember.empty([]); => true
+ Ember.empty('tobias fünke'); => false
+ Ember.empty([0,1,2]); => false
+ @param {Object} obj Value to test
+ @returns {Boolean}
+*/
+Ember.empty = function(obj) {
+ return obj === null || obj === undefined || (obj.length === 0 && typeof obj !== 'function');
+};
+
/**
- The event system uses a series of nested hashes to store listeners on an
- object. When a listener is registered, or when an event arrives, these
- hashes are consulted to determine which target and action pair to invoke.
+ This will compare two javascript values of possibly different types.
+ It will tell you which one is greater than the other by returning:
- The hashes are stored in the object's meta hash, and look like this:
+ - -1 if the first is smaller than the second,
+ - 0 if both are equal,
+ - 1 if the first is greater than the second.
- // Object's meta hash
- {
- listeners: { // variable name: `listenerSet`
- "foo:changed": { // variable name: `targetSet`
- [targetGuid]: { // variable name: `actionSet`
- [methodGuid]: { // variable name: `action`
- target: [Object object],
- method: [Function function],
- xform: [Function function]
- }
- }
- }
- }
- }
+ The order is calculated based on Ember.ORDER_DEFINITION, if types are different.
+ In case they have the same type an appropriate comparison for this type is made.
+ Ember.compare('hello', 'hello'); => 0
+ Ember.compare('abc', 'dfg'); => -1
+ Ember.compare(2, 1); => 1
+
+ @param {Object} v First value to compare
+ @param {Object} w Second value to compare
+ @returns {Number} -1 if v < w, 0 if v = w and 1 if v > w.
*/
+Ember.compare = function compare(v, w) {
+ if (v === w) { return 0; }
-/** @private */
-var metaPath = Ember.metaPath;
+ var type1 = Ember.typeOf(v);
+ var type2 = Ember.typeOf(w);
-// Gets the set of all actions, keyed on the guid of each action's
-// method property.
-function actionSetFor(obj, eventName, target, writable) {
- var targetGuid = guidFor(target);
- return metaPath(obj, ['listeners', eventName, targetGuid], writable);
-}
+ var Comparable = Ember.Comparable;
+ if (Comparable) {
+ if (type1==='instance' && Comparable.detect(v.constructor)) {
+ return v.constructor.compare(v, w);
+ }
-// Gets the set of all targets, keyed on the guid of each action's
-// target property.
-function targetSetFor(obj, eventName) {
- var listenerSet = meta(obj, false).listeners;
- if (!listenerSet) { return false; }
+ if (type2 === 'instance' && Comparable.detect(w.constructor)) {
+ return 1-w.constructor.compare(w, v);
+ }
+ }
- return listenerSet[eventName] || false;
-}
+ // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
+ // do so now.
+ var mapping = Ember.ORDER_DEFINITION_MAPPING;
+ if (!mapping) {
+ var order = Ember.ORDER_DEFINITION;
+ mapping = Ember.ORDER_DEFINITION_MAPPING = {};
+ var idx, len;
+ for (idx = 0, len = order.length; idx < len; ++idx) {
+ mapping[order[idx]] = idx;
+ }
-// TODO: This knowledge should really be a part of the
-// meta system.
-var SKIP_PROPERTIES = { __ember_source__: true };
+ // We no longer need Ember.ORDER_DEFINITION.
+ delete Ember.ORDER_DEFINITION;
+ }
-// For a given target, invokes all of the methods that have
-// been registered as a listener.
-function invokeEvents(targetSet, params) {
- // Iterate through all elements of the target set
- for(var targetGuid in targetSet) {
- if (SKIP_PROPERTIES[targetGuid]) { continue; }
+ var type1Index = mapping[type1];
+ var type2Index = mapping[type2];
- var actionSet = targetSet[targetGuid];
+ if (type1Index < type2Index) { return -1; }
+ if (type1Index > type2Index) { return 1; }
- // Iterate through the elements of the action set
- for(var methodGuid in actionSet) {
- if (SKIP_PROPERTIES[methodGuid]) { continue; }
+ // types are equal - so we have to check values now
+ switch (type1) {
+ case 'boolean':
+ case 'number':
+ if (v < w) { return -1; }
+ if (v > w) { return 1; }
+ return 0;
- var action = actionSet[methodGuid];
- if (!action) { continue; }
+ case 'string':
+ var comp = v.localeCompare(w);
+ if (comp < 0) { return -1; }
+ if (comp > 0) { return 1; }
+ return 0;
- // Extract target and method for each action
- var method = action.method;
- var target = action.target;
+ case 'array':
+ var vLen = v.length;
+ var wLen = w.length;
+ var l = Math.min(vLen, wLen);
+ var r = 0;
+ var i = 0;
+ while (r === 0 && i < l) {
+ r = compare(v[i],w[i]);
+ i++;
+ }
+ if (r !== 0) { return r; }
- // If there is no target, the target is the object
- // on which the event was fired.
- if (!target) { target = params[0]; }
- if ('string' === typeof method) { method = target[method]; }
+ // all elements are equal now
+ // shorter array should be ordered first
+ if (vLen < wLen) { return -1; }
+ if (vLen > wLen) { return 1; }
+ // arrays are equal now
+ return 0;
- // Listeners can provide an `xform` function, which can perform
- // arbitrary transformations, such as changing the order of
- // parameters.
- //
- // This is primarily used by ember-runtime's observer system, which
- // provides a higher level abstraction on top of events, including
- // dynamically looking up current values and passing them into the
- // registered listener.
- var xform = action.xform;
-
- if (xform) {
- xform(target, method, params);
- } else {
- method.apply(target, params);
+ case 'instance':
+ if (Ember.Comparable && Ember.Comparable.detect(v)) {
+ return v.compare(v, w);
}
- }
+ return 0;
+
+ default:
+ return 0;
}
-}
+};
-/**
- The parameters passed to an event listener are not exactly the
- parameters passed to an observer. if you pass an xform function, it will
- be invoked and is able to translate event listener parameters into the form
- that observers are expecting.
+/** @private */
+function _copy(obj, deep, seen, copies) {
+ var ret, loc, key;
- @name Ember.addListener
-*/
-function addListener(obj, eventName, target, method, xform) {
- ember_assert("You must pass at least an object and event name to Ember.addListener", !!obj && !!eventName);
+ // primitive data types are immutable, just return them.
+ if ('object' !== typeof obj || obj===null) return obj;
- if (!method && 'function' === typeof target) {
- method = target;
- target = null;
- }
+ // avoid cyclical loops
+ if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
- var actionSet = actionSetFor(obj, eventName, target, true),
- methodGuid = guidFor(method), ret;
+ ember_assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof Ember.Object) || (Ember.Copyable && Ember.Copyable.detect(obj)));
- if (!actionSet[methodGuid]) {
- actionSet[methodGuid] = { target: target, method: method, xform: xform };
+ // IMPORTANT: this specific test will detect a native array only. Any other
+ // object will need to implement Copyable.
+ if (Ember.typeOf(obj) === 'array') {
+ ret = obj.slice();
+ if (deep) {
+ loc = ret.length;
+ while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
+ }
+ } else if (Ember.Copyable && Ember.Copyable.detect(obj)) {
+ ret = obj.copy(deep, seen, copies);
} else {
- actionSet[methodGuid].xform = xform; // used by observers etc to map params
+ ret = {};
+ for(key in obj) {
+ if (!obj.hasOwnProperty(key)) continue;
+ ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
+ }
}
- if ('function' === typeof obj.didAddListener) {
- obj.didAddListener(eventName, target, method);
+ if (deep) {
+ seen.push(obj);
+ copies.push(ret);
}
- return ret; // return true if this is the first listener.
+ return ret;
}
-function removeListener(obj, eventName, target, method) {
- if (!method && 'function'===typeof target) {
- method = target;
- target = null;
- }
+/**
+ Creates a clone of the passed object. This function can take just about
+ any type of object and create a clone of it, including primitive values
+ (which are not actually cloned because they are immutable).
- var actionSet = actionSetFor(obj, eventName, target, true),
- methodGuid = guidFor(method);
+ If the passed object implements the clone() method, then this function
+ will simply call that method and return the result.
- // we can't simply delete this parameter, because if we do, we might
- // re-expose the property from the prototype chain.
- if (actionSet && actionSet[methodGuid]) { actionSet[methodGuid] = null; }
+ @param {Object} object The object to clone
+ @param {Boolean} deep If true, a deep copy of the object is made
+ @returns {Object} The cloned object
+*/
+Ember.copy = function(obj, deep) {
+ // fast paths
+ if ('object' !== typeof obj || obj===null) return obj; // can't copy primitives
+ if (Ember.Copyable && Ember.Copyable.detect(obj)) return obj.copy(deep);
+ return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
+};
- if (obj && 'function'===typeof obj.didRemoveListener) {
- obj.didRemoveListener(eventName, target, method);
- }
-}
+/**
+ Convenience method to inspect an object. This method will attempt to
+ convert the object into a useful string description.
-// returns a list of currently watched events
-function watchedEvents(obj) {
- var listeners = meta(obj, false).listeners, ret = [];
-
- if (listeners) {
- for(var eventName in listeners) {
- if (!SKIP_PROPERTIES[eventName] && listeners[eventName]) {
- ret.push(eventName);
- }
+ @param {Object} obj The object you want to inspect.
+ @returns {String} A description of the object
+*/
+Ember.inspect = function(obj) {
+ var v, ret = [];
+ for(var key in obj) {
+ if (obj.hasOwnProperty(key)) {
+ v = obj[key];
+ if (v === 'toString') { continue; } // ignore useless items
+ if (Ember.typeOf(v) === 'function') { v = "function() { ... }"; }
+ ret.push(key + ": " + v);
}
}
- return ret;
-}
+ return "{" + ret.join(" , ") + "}";
+};
-function sendEvent(obj, eventName) {
+/**
+ Compares two objects, returning true if they are logically equal. This is
+ a deeper comparison than a simple triple equal. For sets it will compare the
+ internal objects. For any other object that implements `isEqual()` it will
+ respect that method.
- // first give object a chance to handle it
- if (obj !== Ember && 'function' === typeof obj.sendEvent) {
- obj.sendEvent.apply(obj, array_Slice.call(arguments, 1));
- }
+ Ember.isEqual('hello', 'hello'); => true
+ Ember.isEqual(1, 2); => false
+ Ember.isEqual([4,2], [4,2]); => false
- var targetSet = targetSetFor(obj, eventName);
- if (!targetSet) { return false; }
+ @param {Object} a first object to compare
+ @param {Object} b second object to compare
+ @returns {Boolean}
+*/
+Ember.isEqual = function(a, b) {
+ if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
+ return a === b;
+};
- invokeEvents(targetSet, arguments);
- return true;
-}
+/**
+ @private
+ Used by Ember.compare
+*/
+Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
+ 'undefined',
+ 'null',
+ 'boolean',
+ 'number',
+ 'string',
+ 'array',
+ 'object',
+ 'instance',
+ 'function',
+ 'class'
+];
-function hasListeners(obj, eventName) {
- var targetSet = targetSetFor(obj, eventName);
- if (!targetSet) { return false; }
+/**
+ Returns all of the keys defined on an object or hash. This is useful
+ when inspecting objects for debugging. On browsers that support it, this
+ uses the native Object.keys implementation.
- for(var targetGuid in targetSet) {
- if (SKIP_PROPERTIES[targetGuid] || !targetSet[targetGuid]) { continue; }
+ @function
+ @param {Object} obj
+ @returns {Array} Array containing keys of obj
+*/
+Ember.keys = Object.keys;
- var actionSet = targetSet[targetGuid];
-
- for(var methodGuid in actionSet) {
- if (SKIP_PROPERTIES[methodGuid] || !actionSet[methodGuid]) { continue; }
- return true; // stop as soon as we find a valid listener
+if (!Ember.keys) {
+ Ember.keys = function(obj) {
+ var ret = [];
+ for(var key in obj) {
+ if (obj.hasOwnProperty(key)) { ret.push(key); }
}
- }
-
- // no listeners! might as well clean this up so it is faster later.
- var set = metaPath(obj, ['listeners'], true);
- set[eventName] = null;
-
- return false;
+ return ret;
+ };
}
-function listenersFor(obj, eventName) {
- var targetSet = targetSetFor(obj, eventName), ret = [];
- if (!targetSet) { return ret; }
+// ..........................................................
+// ERROR
+//
- var info;
- for(var targetGuid in targetSet) {
- if (SKIP_PROPERTIES[targetGuid] || !targetSet[targetGuid]) { continue; }
+/**
+ @class
- var actionSet = targetSet[targetGuid];
+ A subclass of the JavaScript Error object for use in Ember.
+*/
+Ember.Error = function() {
+ var tmp = Error.prototype.constructor.apply(this, arguments);
- for(var methodGuid in actionSet) {
- if (SKIP_PROPERTIES[methodGuid] || !actionSet[methodGuid]) { continue; }
- info = actionSet[methodGuid];
- ret.push([info.target, info.method]);
- }
+ for (var p in tmp) {
+ if (tmp.hasOwnProperty(p)) { this[p] = tmp[p]; }
}
+ this.message = tmp.message;
+};
- return ret;
-}
+Ember.Error.prototype = Ember.create(Error.prototype);
-Ember.addListener = addListener;
-Ember.removeListener = removeListener;
-Ember.sendEvent = sendEvent;
-Ember.hasListeners = hasListeners;
-Ember.watchedEvents = watchedEvents;
-Ember.listenersFor = listenersFor;
+})();
-})({});
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc. and contributors.
+// Copyright: ©2011 Strobe Inc.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-var Mixin, MixinDelegate, REQUIRED, Alias;
-var classToString, superClassString;
-var a_map = Array.prototype.map;
-var a_slice = Array.prototype.slice;
-var EMPTY_META = {}; // dummy for non-writable meta
-var META_SKIP = { __emberproto__: true, __ember_count__: true };
+/** @private **/
+var STRING_DASHERIZE_REGEXP = (/[ _]/g);
+var STRING_DASHERIZE_CACHE = {};
+var STRING_DECAMELIZE_REGEXP = (/([a-z])([A-Z])/g);
+var STRING_CAMELIZE_REGEXP = (/(\-|_|\s)+(.)?/g);
+var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
+var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
-var o_create = Ember.platform.create;
+/**
+ Defines the hash of localized strings for the current language. Used by
+ the `Ember.String.loc()` helper. To localize, add string values to this
+ hash.
-function meta(obj, writable) {
- var m = Ember.meta(obj, writable!==false), ret = m.mixins;
- if (writable===false) return ret || EMPTY_META;
+ @property {String}
+*/
+Ember.STRINGS = {};
- if (!ret) {
- ret = m.mixins = { __emberproto__: obj };
- } else if (ret.__emberproto__ !== obj) {
- ret = m.mixins = o_create(ret);
- ret.__emberproto__ = obj;
- }
- return ret;
-}
+/**
+ Defines string helper methods including string formatting and localization.
+ Unless Ember.EXTEND_PROTOTYPES = false these methods will also be added to the
+ String.prototype as well.
-function initMixin(mixin, args) {
- if (args && args.length > 0) {
- mixin.mixins = a_map.call(args, function(x) {
- if (x instanceof Mixin) return x;
+ @namespace
+*/
+Ember.String = {
- // Note: Manually setup a primitive mixin here. This is the only
- // way to actually get a primitive mixin. This way normal creation
- // of mixins will give you combined mixins...
- var mixin = new Mixin();
- mixin.properties = x;
- return mixin;
- });
- }
- return mixin;
-}
+ /**
+ Apply formatting options to the string. This will look for occurrences
+ of %@ in your string and substitute them with the arguments you pass into
+ this method. If you want to control the specific order of replacement,
+ you can add a number after the key as well to indicate which argument
+ you want to insert.
-var NATIVES = [Boolean, Object, Number, Array, Date, String];
-function isMethod(obj) {
- if ('function' !== typeof obj || obj.isMethod===false) return false;
- return NATIVES.indexOf(obj)<0;
-}
+ Ordered insertions are most useful when building loc strings where values
+ you need to insert may appear in different orders.
-function mergeMixins(mixins, m, descs, values, base) {
- var len = mixins.length, idx, mixin, guid, props, value, key, ovalue, concats;
+ "Hello %@ %@".fmt('John', 'Doe') => "Hello John Doe"
+ "Hello %@2, %@1".fmt('John', 'Doe') => "Hello Doe, John"
- function removeKeys(keyName) {
- delete descs[keyName];
- delete values[keyName];
- }
+ @param {Object...} [args]
+ @returns {String} formatted string
+ */
+ fmt: function(str, formats) {
+ // first, replace any ORDERED replacements.
+ var idx = 0; // the current index for non-numerical replacements
+ return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
+ argIndex = (argIndex) ? parseInt(argIndex,0) - 1 : idx++ ;
+ s = formats[argIndex];
+ return ((s === null) ? '(null)' : (s === undefined) ? '' : s).toString();
+ }) ;
+ },
- for(idx=0;idx<len;idx++) {
+ /**
+ Formats the passed string, but first looks up the string in the localized
+ strings hash. This is a convenient way to localize text. See
+ `Ember.String.fmt()` for more information on formatting.
- mixin = mixins[idx];
- if (!mixin) throw new Error('Null value found in Ember.mixin()');
+ Note that it is traditional but not required to prefix localized string
+ keys with an underscore or other character so you can easily identify
+ localized strings.
- if (mixin instanceof Mixin) {
- guid = Ember.guidFor(mixin);
- if (m[guid]) continue;
- m[guid] = mixin;
- props = mixin.properties;
- } else {
- props = mixin; // apply anonymous mixin properties
- }
+ Ember.STRINGS = {
+ '_Hello World': 'Bonjour le monde',
+ '_Hello %@ %@': 'Bonjour %@ %@'
+ };
- if (props) {
+ Ember.String.loc("_Hello World");
+ => 'Bonjour le monde';
- // reset before adding each new mixin to pickup concats from previous
- concats = values.concatenatedProperties || base.concatenatedProperties;
- if (props.concatenatedProperties) {
- concats = concats ? concats.concat(props.concatenatedProperties) : props.concatenatedProperties;
- }
+ Ember.String.loc("_Hello %@ %@", ["John", "Smith"]);
+ => "Bonjour John Smith";
- for (key in props) {
- if (!props.hasOwnProperty(key)) continue;
- value = props[key];
- if (value instanceof Ember.Descriptor) {
- if (value === REQUIRED && descs[key]) { continue; }
+ @param {String} str
+ The string to format
- descs[key] = value;
- values[key] = undefined;
- } else {
+ @param {Array} formats
+ Optional array of parameters to interpolate into string.
- // impl super if needed...
- if (isMethod(value)) {
- ovalue = (descs[key] === Ember.SIMPLE_PROPERTY) && values[key];
- if (!ovalue) ovalue = base[key];
- if ('function' !== typeof ovalue) ovalue = null;
- if (ovalue) {
- var o = value.__ember_observes__, ob = value.__ember_observesBefore__;
- value = Ember.wrap(value, ovalue);
- value.__ember_observes__ = o;
- value.__ember_observesBefore__ = ob;
- }
- } else if ((concats && concats.indexOf(key)>=0) || key === 'concatenatedProperties') {
- var baseValue = values[key] || base[key];
- value = baseValue ? baseValue.concat(value) : Ember.makeArray(value);
- }
+ @returns {String} formatted string
+ */
+ loc: function(str, formats) {
+ str = Ember.STRINGS[str] || str;
+ return Ember.String.fmt(str, formats) ;
+ },
- descs[key] = Ember.SIMPLE_PROPERTY;
- values[key] = value;
- }
- }
+ /**
+ Splits a string into separate units separated by spaces, eliminating any
+ empty strings in the process. This is a convenience method for split that
+ is mostly useful when applied to the String.prototype.
- // manually copy toString() because some JS engines do not enumerate it
- if (props.hasOwnProperty('toString')) {
- base.toString = props.toString;
- }
+ Ember.String.w("alpha beta gamma").forEach(function(key) {
+ console.log(key);
+ });
+ > alpha
+ > beta
+ > gamma
- } else if (mixin.mixins) {
- mergeMixins(mixin.mixins, m, descs, values, base);
- if (mixin._without) mixin._without.forEach(removeKeys);
- }
- }
-}
+ @param {String} str
+ The string to split
-var defineProperty = Ember.defineProperty;
+ @returns {String} split string
+ */
+ w: function(str) { return str.split(/\s+/); },
-function writableReq(obj) {
- var m = Ember.meta(obj), req = m.required;
- if (!req || (req.__emberproto__ !== obj)) {
- req = m.required = req ? o_create(req) : { __ember_count__: 0 };
- req.__emberproto__ = obj;
- }
- return req;
-}
+ /**
+ Converts a camelized string into all lower case separated by underscores.
+
+ 'innerHTML'.decamelize() => 'inner_html'
+ 'action_name'.decamelize() => 'action_name'
+ 'css-class-name'.decamelize() => 'css-class-name'
+ 'my favorite items'.decamelize() => 'my favorite items'
-function getObserverPaths(value) {
- return ('function' === typeof value) && value.__ember_observes__;
-}
+ @param {String} str
+ The string to decamelize.
-function getBeforeObserverPaths(value) {
- return ('function' === typeof value) && value.__ember_observesBefore__;
-}
+ @returns {String} the decamelized string.
+ */
+ decamelize: function(str) {
+ return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+ },
-Ember._mixinBindings = function(obj, key, value, m) {
- return value;
-};
+ /**
+ Replaces underscores or spaces with dashes.
+
+ 'innerHTML'.dasherize() => 'inner-html'
+ 'action_name'.dasherize() => 'action-name'
+ 'css-class-name'.dasherize() => 'css-class-name'
+ 'my favorite items'.dasherize() => 'my-favorite-items'
-function applyMixin(obj, mixins, partial) {
- var descs = {}, values = {}, m = Ember.meta(obj), req = m.required;
- var key, willApply, didApply, value, desc;
+ @param {String} str
+ The string to dasherize.
- var mixinBindings = Ember._mixinBindings;
+ @returns {String} the dasherized string.
+ */
+ dasherize: function(str) {
+ var cache = STRING_DASHERIZE_CACHE,
+ ret = cache[str];
- mergeMixins(mixins, meta(obj), descs, values, obj);
+ if (ret) {
+ return ret;
+ } else {
+ ret = Ember.String.decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
+ cache[str] = ret;
+ }
- if (MixinDelegate.detect(obj)) {
- willApply = values.willApplyProperty || obj.willApplyProperty;
- didApply = values.didApplyProperty || obj.didApplyProperty;
- }
+ return ret;
+ },
- for(key in descs) {
- if (!descs.hasOwnProperty(key)) continue;
+ /**
+ Returns the lowerCaseCamel form of a string.
+
+ 'innerHTML'.camelize() => 'innerHTML'
+ 'action_name'.camelize() => 'actionName'
+ 'css-class-name'.camelize() => 'cssClassName'
+ 'my favorite items'.camelize() => 'myFavoriteItems'
- desc = descs[key];
- value = values[key];
+ @param {String} str
+ The string to camelize.
- if (desc === REQUIRED) {
- if (!(key in obj)) {
- if (!partial) throw new Error('Required property not defined: '+key);
+ @returns {String} the camelized string.
+ */
+ camelize: function(str) {
+ return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+ return chr ? chr.toUpperCase() : '';
+ });
+ },
- // for partial applies add to hash of required keys
- req = writableReq(obj);
- req.__ember_count__++;
- req[key] = true;
- }
+ /**
+ More general than decamelize. Returns the lower_case_and_underscored
+ form of a string.
- } else {
+ 'innerHTML'.underscore() => 'inner_html'
+ 'action_name'.underscore() => 'action_name'
+ 'css-class-name'.underscore() => 'css_class_name'
+ 'my favorite items'.underscore() => 'my_favorite_items'
- while (desc instanceof Alias) {
+ @param {String} str
+ The string to underscore.
- var altKey = desc.methodName;
- if (descs[altKey]) {
- value = values[altKey];
- desc = descs[altKey];
- } else if (m.descs[altKey]) {
- desc = m.descs[altKey];
- value = desc.val(obj, altKey);
- } else {
- value = obj[altKey];
- desc = Ember.SIMPLE_PROPERTY;
- }
- }
+ @returns {String} the underscored string.
+ */
+ underscore: function(str) {
+ return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+ replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+ }
+};
+})();
- if (willApply) willApply.call(obj, key);
- var observerPaths = getObserverPaths(value),
- curObserverPaths = observerPaths && getObserverPaths(obj[key]),
- beforeObserverPaths = getBeforeObserverPaths(value),
- curBeforeObserverPaths = beforeObserverPaths && getBeforeObserverPaths(obj[key]),
- len, idx;
- if (curObserverPaths) {
- len = curObserverPaths.length;
- for(idx=0;idx<len;idx++) {
- Ember.removeObserver(obj, curObserverPaths[idx], null, key);
- }
- }
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var fmt = Ember.String.fmt,
+ w = Ember.String.w,
+ loc = Ember.String.loc,
+ camelize = Ember.String.camelize,
+ decamelize = Ember.String.decamelize,
+ dasherize = Ember.String.dasherize,
+ underscore = Ember.String.underscore;
- if (curBeforeObserverPaths) {
- len = curBeforeObserverPaths.length;
- for(idx=0;idx<len;idx++) {
- Ember.removeBeforeObserver(obj, curBeforeObserverPaths[idx], null,key);
- }
- }
+if (Ember.EXTEND_PROTOTYPES) {
- // TODO: less hacky way for ember-runtime to add bindings.
- value = mixinBindings(obj, key, value, m);
+ /**
+ @see Ember.String.fmt
+ */
+ String.prototype.fmt = function() {
+ return fmt(this, arguments);
+ };
- defineProperty(obj, key, desc, value);
+ /**
+ @see Ember.String.w
+ */
+ String.prototype.w = function() {
+ return w(this);
+ };
- if (observerPaths) {
- len = observerPaths.length;
- for(idx=0;idx<len;idx++) {
- Ember.addObserver(obj, observerPaths[idx], null, key);
- }
- }
+ /**
+ @see Ember.String.loc
+ */
+ String.prototype.loc = function() {
+ return loc(this, arguments);
+ };
- if (beforeObserverPaths) {
- len = beforeObserverPaths.length;
- for(idx=0;idx<len;idx++) {
- Ember.addBeforeObserver(obj, beforeObserverPaths[idx], null, key);
- }
- }
+ /**
+ @see Ember.String.camelize
+ */
+ String.prototype.camelize = function() {
+ return camelize(this);
+ };
- if (req && req[key]) {
- req = writableReq(obj);
- req.__ember_count__--;
- req[key] = false;
- }
+ /**
+ @see Ember.String.decamelize
+ */
+ String.prototype.decamelize = function() {
+ return decamelize(this);
+ };
- if (didApply) didApply.call(obj, key);
+ /**
+ @see Ember.String.dasherize
+ */
+ String.prototype.dasherize = function() {
+ return dasherize(this);
+ };
- }
- }
+ /**
+ @see Ember.String.underscore
+ */
+ String.prototype.underscore = function() {
+ return underscore(this);
+ };
- // Make sure no required attrs remain
- if (!partial && req && req.__ember_count__>0) {
- var keys = [];
- for(key in req) {
- if (META_SKIP[key]) continue;
- keys.push(key);
- }
- throw new Error('Required properties not defined: '+keys.join(','));
- }
- return obj;
}
-Ember.mixin = function(obj) {
- var args = a_slice.call(arguments, 1);
- return applyMixin(obj, args, false);
-};
+})();
-/**
- @constructor
- @name Ember.Mixin
-*/
-Mixin = function() { return initMixin(this, arguments); };
-Mixin._apply = applyMixin;
-Mixin.applyPartial = function(obj) {
- var args = a_slice.call(arguments, 1);
- return applyMixin(obj, args, true);
-};
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var a_slice = Array.prototype.slice;
-Mixin.create = function() {
- classToString.processed = false;
- var M = this;
- return initMixin(new M(), arguments);
-};
+if (Ember.EXTEND_PROTOTYPES) {
-Mixin.prototype.reopen = function() {
+ /**
+ The `property` extension of Javascript's Function prototype is available
+ when Ember.EXTEND_PROTOTYPES is true, which is the default.
- var mixin, tmp;
+ Computed properties allow you to treat a function like a property:
- if (this.properties) {
- mixin = Mixin.create();
- mixin.properties = this.properties;
- delete this.properties;
- this.mixins = [mixin];
- }
+ MyApp.president = Ember.Object.create({
+ firstName: "Barack",
+ lastName: "Obama",
- var len = arguments.length, mixins = this.mixins, idx;
+ fullName: function() {
+ return this.get('firstName') + ' ' + this.get('lastName');
- for(idx=0;idx<len;idx++) {
- mixin = arguments[idx];
- if (mixin instanceof Mixin) {
- mixins.push(mixin);
- } else {
- tmp = Mixin.create();
- tmp.properties = mixin;
- mixins.push(tmp);
- }
- }
+ // Call this flag to mark the function as a property
+ }.property()
+ });
- return this;
-};
+ MyApp.president.get('fullName'); => "Barack Obama"
-var TMP_ARRAY = [];
-Mixin.prototype.apply = function(obj) {
- TMP_ARRAY[0] = this;
- var ret = applyMixin(obj, TMP_ARRAY, false);
- TMP_ARRAY.length=0;
- return ret;
-};
+ Treating a function like a property is useful because they can work with
+ bindings, just like any other property.
-Mixin.prototype.applyPartial = function(obj) {
- TMP_ARRAY[0] = this;
- var ret = applyMixin(obj, TMP_ARRAY, true);
- TMP_ARRAY.length=0;
- return ret;
-};
+ Many computed properties have dependencies on other properties. For
+ example, in the above example, the `fullName` property depends on
+ `firstName` and `lastName` to determine its value. You can tell Ember.js
+ about these dependencies like this:
-function _detect(curMixin, targetMixin, seen) {
- var guid = Ember.guidFor(curMixin);
+ MyApp.president = Ember.Object.create({
+ firstName: "Barack",
+ lastName: "Obama",
- if (seen[guid]) return false;
- seen[guid] = true;
+ fullName: function() {
+ return this.get('firstName') + ' ' + this.get('lastName');
- if (curMixin === targetMixin) return true;
- var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
- while(--loc >= 0) {
- if (_detect(mixins[loc], targetMixin, seen)) return true;
- }
- return false;
-}
+ // Tell Ember.js that this computed property depends on firstName
+ // and lastName
+ }.property('firstName', 'lastName')
+ });
-Mixin.prototype.detect = function(obj) {
- if (!obj) return false;
- if (obj instanceof Mixin) return _detect(obj, this, {});
- return !!meta(obj, false)[Ember.guidFor(this)];
-};
+ Make sure you list these dependencies so Ember.js knows when to update
+ bindings that connect to a computed property.
-Mixin.prototype.without = function() {
- var ret = new Mixin(this);
- ret._without = a_slice.call(arguments);
- return ret;
-};
+ Note: you will usually want to use `property(...)` with `cacheable()`.
-function _keys(ret, mixin, seen) {
- if (seen[Ember.guidFor(mixin)]) return;
- seen[Ember.guidFor(mixin)] = true;
+ @see Ember.ComputedProperty
+ @see Ember.computed
+ */
+ Function.prototype.property = function() {
+ var ret = Ember.computed(this);
+ return ret.property.apply(ret, arguments);
+ };
- if (mixin.properties) {
- var props = mixin.properties;
- for(var key in props) {
- if (props.hasOwnProperty(key)) ret[key] = true;
- }
- } else if (mixin.mixins) {
- mixin.mixins.forEach(function(x) { _keys(ret, x, seen); });
- }
-}
+ /**
+ The `observes` extension of Javascript's Function prototype is available
+ when Ember.EXTEND_PROTOTYPES is true, which is the default.
-Mixin.prototype.keys = function() {
- var keys = {}, seen = {}, ret = [];
- _keys(keys, this, seen);
- for(var key in keys) {
- if (keys.hasOwnProperty(key)) ret.push(key);
- }
- return ret;
-};
+ You can observe property changes simply by adding the `observes`
+ call to the end of your method declarations in classes that you write.
+ For example:
-/** @private - make Mixin's have nice displayNames */
+ Ember.Object.create({
+ valueObserver: function() {
+ // Executes whenever the "value" property changes
+ }.observes('value')
+ });
+
+ @see Ember.Observable
+ */
+ Function.prototype.observes = function() {
+ this.__ember_observes__ = a_slice.call(arguments);
+ return this;
+ };
-var NAME_KEY = Ember.GUID_KEY+'_name';
-var get = Ember.get;
+ /**
+ The `observesBefore` extension of Javascript's Function prototype is
+ available when Ember.EXTEND_PROTOTYPES is true, which is the default.
-function processNames(paths, root, seen) {
- var idx = paths.length;
- for(var key in root) {
- if (!root.hasOwnProperty || !root.hasOwnProperty(key)) continue;
- var obj = root[key];
- paths[idx] = key;
+ You can get notified when a property changes is about to happen by
+ by adding the `observesBefore` call to the end of your method
+ declarations in classes that you write. For example:
- if (obj && obj.toString === classToString) {
- obj[NAME_KEY] = paths.join('.');
- } else if (obj && get(obj, 'isNamespace')) {
- if (seen[Ember.guidFor(obj)]) continue;
- seen[Ember.guidFor(obj)] = true;
- processNames(paths, obj, seen);
- }
+ Ember.Object.create({
+ valueObserver: function() {
+ // Executes whenever the "value" property is about to change
+ }.observesBefore('value')
+ });
+
+ @see Ember.Observable
+ */
+ Function.prototype.observesBefore = function() {
+ this.__ember_observesBefore__ = a_slice.call(arguments);
+ return this;
+ };
- }
- paths.length = idx; // cut out last item
}
-function findNamespaces() {
- var Namespace = Ember.Namespace, obj;
- if (Namespace.PROCESSED) { return; }
+})();
- for (var prop in window) {
- // get(window.globalStorage, 'isNamespace') would try to read the storage for domain isNamespace and cause exception in Firefox.
- // globalStorage is a storage obsoleted by the WhatWG storage specification. See https://developer.mozilla.org/en/DOM/Storage#globalStorage
- if (prop === "globalStorage" && window.StorageList && window.globalStorage instanceof window.StorageList) { continue; }
- // Unfortunately, some versions of IE don't support window.hasOwnProperty
- if (window.hasOwnProperty && !window.hasOwnProperty(prop)) { continue; }
- obj = window[prop];
- if (obj && get(obj, 'isNamespace')) {
- obj[NAME_KEY] = prop;
- }
- }
-}
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var IS_BINDING = Ember.IS_BINDING = /^.+Binding$/;
-Ember.identifyNamespaces = findNamespaces;
-
-superClassString = function(mixin) {
- var superclass = mixin.superclass;
- if (superclass) {
- if (superclass[NAME_KEY]) { return superclass[NAME_KEY]; }
- else { return superClassString(superclass); }
- } else {
- return;
- }
-};
-
-classToString = function() {
- var Namespace = Ember.Namespace, namespace;
-
- // TODO: Namespace should really be in Metal
- if (Namespace) {
- if (!this[NAME_KEY] && !classToString.processed) {
- if (!Namespace.PROCESSED) {
- findNamespaces();
- Namespace.PROCESSED = true;
- }
-
- classToString.processed = true;
-
- var namespaces = Namespace.NAMESPACES;
- for (var i=0, l=namespaces.length; i<l; i++) {
- namespace = namespaces[i];
- processNames([namespace.toString()], namespace, {});
- }
+Ember._mixinBindings = function(obj, key, value, m) {
+ if (IS_BINDING.test(key)) {
+ if (!(value instanceof Ember.Binding)) {
+ value = new Ember.Binding(key.slice(0,-7), value); // make binding
+ } else {
+ value.to(key.slice(0, -7));
}
- }
+ value.connect(obj);
- if (this[NAME_KEY]) {
- return this[NAME_KEY];
- } else {
- var str = superClassString(this);
- if (str) {
- return "(subclass of " + str + ")";
- } else {
- return "(unknown mixin)";
+ // keep a set of bindings in the meta so that when we rewatch we can
+ // resync them...
+ var bindings = m.bindings;
+ if (!bindings) {
+ bindings = m.bindings = { __emberproto__: obj };
+ } else if (bindings.__emberproto__ !== obj) {
+ bindings = m.bindings = Ember.create(m.bindings);
+ bindings.__emberproto__ = obj;
}
- }
-};
-Mixin.prototype.toString = classToString;
-
-// returns the mixins currently applied to the specified object
-// TODO: Make Ember.mixin
-Mixin.mixins = function(obj) {
- var ret = [], mixins = meta(obj, false), key, mixin;
- for(key in mixins) {
- if (META_SKIP[key]) continue;
- mixin = mixins[key];
-
- // skip primitive mixins since these are always anonymous
- if (!mixin.properties) ret.push(mixins[key]);
+ bindings[key] = true;
}
- return ret;
-};
-REQUIRED = new Ember.Descriptor();
-REQUIRED.toString = function() { return '(Required Property)'; };
-
-Ember.required = function() {
- return REQUIRED;
+ return value;
};
-Alias = function(methodName) {
- this.methodName = methodName;
-};
-Alias.prototype = new Ember.Descriptor();
+})();
-Ember.alias = function(methodName) {
- return new Alias(methodName);
-};
-Ember.Mixin = Mixin;
-MixinDelegate = Mixin.create({
-
- willApplyProperty: Ember.required(),
- didApplyProperty: Ember.required()
-
-});
-
-Ember.MixinDelegate = MixinDelegate;
-
-
-// ..........................................................
-// OBSERVER HELPER
-//
-
-Ember.observer = function(func) {
- var paths = a_slice.call(arguments, 1);
- func.__ember_observes__ = paths;
- return func;
-};
-
-Ember.beforeObserver = function(func) {
- var paths = a_slice.call(arguments, 1);
- func.__ember_observesBefore__ = paths;
- return func;
-};
-
-
-
-
-
-
-
-})({});
-
-
-(function(exports) {
+(function() {
// ==========================================================================
-// Project: Ember Metal
+// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
-(function(exports) {
+})();
+
+
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -6314,35 +7786,40 @@
// ..........................................................
// HELPERS
-//
+//
var get = Ember.get, set = Ember.set;
var a_slice = Array.prototype.slice;
+var a_indexOf = Ember.ArrayUtils.indexOf;
var contexts = [];
+/** @private */
function popCtx() {
return contexts.length===0 ? {} : contexts.pop();
}
+/** @private */
function pushCtx(ctx) {
contexts.push(ctx);
return null;
}
+/** @private */
function iter(key, value) {
var valueProvided = arguments.length === 2;
function i(item) {
var cur = get(item, key);
return valueProvided ? value===cur : !!cur;
- }
+ }
return i ;
}
+/** @private */
function xform(target, method, params) {
method.call(target, params[0], params[2], params[3]);
}
/**
@@ -6381,14 +7858,14 @@
JavaScript 1.8 API.
@since Ember 0.9
*/
Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ {
-
+
/** @private - compatibility */
isEnumerable: true,
-
+
/**
Implement this method to make your class enumerable.
This method will be call repeatedly during enumeration. The index value
will always begin with 0 and increment monotonically. You don't have to
@@ -6408,11 +7885,11 @@
Generally iterators will continue to call nextObject until the index
reaches the your current length-1. If you run out of data before this
time for some reason, you should simply return undefined.
- The default impementation of this method simply looks up the index.
+ The default implementation of this method simply looks up the index.
This works great on any Array-like objects.
@param index {Number} the current index of the iteration
@param previousObject {Object} the value returned by the last call to nextObject.
@param context {Object} a context object you can use to maintain state.
@@ -6428,22 +7905,21 @@
If you override this method, you should implement it so that it will
always return the same value each time it is called. If your enumerable
contains only one object, this method should always return that object.
If your enumerable is empty, this method should return undefined.
- @returns {Object} the object or undefined
+ var arr = ["a", "b", "c"];
+ arr.firstObject(); => "a"
- @example
- var arr = ["a", "b", "c"];
- arr.firstObject(); => "a"
+ var arr = [];
+ arr.firstObject(); => undefined
- var arr = [];
- arr.firstObject(); => undefined
+ @returns {Object} the object or undefined
*/
firstObject: Ember.computed(function() {
if (get(this, 'length')===0) return undefined ;
- if (Ember.Array && Ember.Array.detect(this)) return this.objectAt(0);
+ if (Ember.Array && Ember.Array.detect(this)) return this.objectAt(0);
// handle generic enumerables
var context = popCtx(), ret;
ret = this.nextObject(0, null, context);
pushCtx(context);
@@ -6453,18 +7929,17 @@
/**
Helper method returns the last object from a collection. If your enumerable
contains only one object, this method should always return that object.
If your enumerable is empty, this method should return undefined.
- @returns {Object} the last object or undefined
+ var arr = ["a", "b", "c"];
+ arr.lastObject(); => "c"
- @example
- var arr = ["a", "b", "c"];
- arr.lastObject(); => "c"
+ var arr = [];
+ arr.lastObject(); => undefined
- var arr = [];
- arr.lastObject(); => undefined
+ @returns {Object} the last object or undefined
*/
lastObject: Ember.computed(function() {
var len = get(this, 'length');
if (len===0) return undefined ;
if (Ember.Array && Ember.Array.detect(this)) {
@@ -6480,22 +7955,26 @@
}
}).property(),
/**
Returns true if the passed object can be found in the receiver. The
- default version will iterate through the enumerable until the object
+ default version will iterate through the enumerable until the object
is found. You may want to override this with a more efficient version.
-
+
+ var arr = ["a", "b", "c"];
+ arr.contains("a"); => true
+ arr.contains("z"); => false
+
@param {Object} obj
The object to search for.
-
+
@returns {Boolean} true if object is found in enumerable.
*/
contains: function(obj) {
- return this.find(function(item) { return item===obj; }) !== undefined;
+ return this.find(function(item) { return item===obj; }) !== undefined;
},
-
+
/**
Iterates through the enumerable, calling the passed function on each
item. This method corresponds to the forEach() method defined in
JavaScript 1.6.
@@ -6581,12 +8060,12 @@
@param {Object} target The target object to use
@returns {Array} The mapped array.
*/
map: function(callback, target) {
var ret = [];
- this.forEach(function(x, idx, i) {
- ret[idx] = callback.call(target, x, idx,i);
+ this.forEach(function(x, idx, i) {
+ ret[idx] = callback.call(target, x, idx,i);
});
return ret ;
},
/**
@@ -6602,11 +8081,11 @@
});
},
/**
Returns an array with all of the items in the enumeration that the passed
- function returns YES for. This method corresponds to filter() defined in
+ function returns true for. This method corresponds to filter() defined in
JavaScript 1.6.
The callback method you provide should have the following signature (all
parameters are optional):
@@ -6614,11 +8093,11 @@
- *item* is the current item in the iteration.
- *index* is the current index in the iteration
- *enumerable* is the enumerable object itself.
- It should return the YES to include the item in the results, NO otherwise.
+ It should return the true to include the item in the results, false otherwise.
Note that in addition to a callback, you can also pass an optional target
object that will be set as "this" on the context. This is a good way
to give your iterator function access to the current object.
@@ -6646,11 +8125,11 @@
filterProperty: function(key, value) {
return this.filter(iter.apply(this, arguments));
},
/**
- Returns the first item in the array for which the callback returns YES.
+ Returns the first item in the array for which the callback returns true.
This method works similar to the filter() method defined in JavaScript 1.6
except that it will stop working on the array once a match is found.
The callback method you provide should have the following signature (all
parameters are optional):
@@ -6659,11 +8138,11 @@
- *item* is the current item in the iteration.
- *index* is the current index in the iteration
- *enumerable* is the enumerable object itself.
- It should return the YES to include the item in the results, NO otherwise.
+ It should return the true to include the item in the results, false otherwise.
Note that in addition to a callback, you can also pass an optional target
object that will be set as "this" on the context. This is a good way
to give your iterator function access to the current object.
@@ -6701,11 +8180,11 @@
findProperty: function(key, value) {
return this.find(iter.apply(this, arguments));
},
/**
- Returns YES if the passed function returns YES for every item in the
+ Returns true if the passed function returns true for every item in the
enumeration. This corresponds with the every() method in JavaScript 1.6.
The callback method you provide should have the following signature (all
parameters are optional):
@@ -6713,11 +8192,11 @@
- *item* is the current item in the iteration.
- *index* is the current index in the iteration
- *enumerable* is the enumerable object itself.
- It should return the YES or NO.
+ It should return the true or false.
Note that in addition to a callback, you can also pass an optional target
object that will be set as "this" on the context. This is a good way
to give your iterator function access to the current object.
@@ -6747,11 +8226,11 @@
return this.every(iter.apply(this, arguments));
},
/**
- Returns YES if the passed function returns true for any item in the
+ Returns true if the passed function returns true for any item in the
enumeration. This corresponds with the every() method in JavaScript 1.6.
The callback method you provide should have the following signature (all
parameters are optional):
@@ -6759,11 +8238,11 @@
- *item* is the current item in the iteration.
- *index* is the current index in the iteration
- *enumerable* is the enumerable object itself.
- It should return the YES to include the item in the results, NO otherwise.
+ It should return the true to include the item in the results, false otherwise.
Note that in addition to a callback, you can also pass an optional target
object that will be set as "this" on the context. This is a good way
to give your iterator function access to the current object.
@@ -6845,23 +8324,23 @@
@returns {Array} return values from calling invoke.
*/
invoke: function(methodName) {
var args, ret = [];
if (arguments.length>1) args = a_slice.call(arguments, 1);
-
- this.forEach(function(x, idx) {
+
+ this.forEach(function(x, idx) {
var method = x && x[methodName];
if ('function' === typeof method) {
ret[idx] = args ? method.apply(x, args) : method.call(x);
}
}, this);
-
+
return ret;
},
/**
- Simply converts the enumerable into a genuine array. The order is not
+ Simply converts the enumerable into a genuine array. The order is not
guaranteed. Corresponds to the method implemented by Prototype.
@returns {Array} the enumerable as an array.
*/
toArray: function() {
@@ -6869,44 +8348,52 @@
this.forEach(function(o, idx) { ret[idx] = o; });
return ret ;
},
/**
- Generates a new array with the contents of the old array, sans any null
- values.
+ Returns a copy of the array with all null elements removed.
+
+ var arr = ["a", null, "c", null];
+ arr.compact(); => ["a", "c"]
- @returns {Array}
+ @returns {Array} the array without null elements.
*/
compact: function() { return this.without(null); },
/**
Returns a new enumerable that excludes the passed value. The default
implementation returns an array regardless of the receiver type unless
the receiver does not contain the value.
+ var arr = ["a", "b", "a", "c"];
+ arr.without("a"); => ["b", "c"]
+
@param {Object} value
@returns {Ember.Enumerable}
*/
without: function(value) {
if (!this.contains(value)) return this; // nothing to do
var ret = [] ;
- this.forEach(function(k) {
+ this.forEach(function(k) {
if (k !== value) ret[ret.length] = k;
}) ;
return ret ;
},
/**
Returns a new enumerable that contains only unique values. The default
implementation returns an array regardless of the receiver type.
-
+
+ var arr = ["a", "a", "b", "b"];
+ arr.uniq(); => ["a", "b"]
+
@returns {Ember.Enumerable}
*/
uniq: function() {
var ret = [];
this.forEach(function(k){
- if (ret.indexOf(k)<0) ret.push(k);
+ if (a_indexOf(ret, k)<0) ret.push(k);
});
return ret;
},
/**
@@ -6917,18 +8404,18 @@
For plain enumerables, this property is read only. Ember.Array overrides
this method.
@property {Ember.Array}
*/
- '[]': Ember.computed(function(key, value) {
- return this;
+ '[]': Ember.computed(function(key, value) {
+ return this;
}).property().cacheable(),
// ..........................................................
// ENUMERABLE OBSERVERS
- //
-
+ //
+
/**
Registers an enumerable observer. Must implement Ember.EnumerableObserver
mixin.
*/
addEnumerableObserver: function(target, opts) {
@@ -6942,11 +8429,11 @@
if (!hasObservers) Ember.propertyDidChange(this, 'hasEnumerableObservers');
return this;
},
/**
- Removes a registered enumerable observer.
+ Removes a registered enumerable observer.
*/
removeEnumerableObserver: function(target, opts) {
var willChange = (opts && opts.willChange) || 'enumerableWillChange',
didChange = (opts && opts.didChange) || 'enumerableDidChange';
@@ -6955,81 +8442,81 @@
Ember.removeListener(this, '@enumerable:before', target, willChange);
Ember.removeListener(this, '@enumerable:change', target, didChange);
if (hasObservers) Ember.propertyDidChange(this, 'hasEnumerableObservers');
return this;
},
-
+
/**
Becomes true whenever the array currently has observers watching changes
on the array.
-
+
@property {Boolean}
*/
hasEnumerableObservers: Ember.computed(function() {
return Ember.hasListeners(this, '@enumerable:change') || Ember.hasListeners(this, '@enumerable:before');
}).property().cacheable(),
-
-
+
+
/**
- Invoke this method just before the contents of your enumerable will
+ Invoke this method just before the contents of your enumerable will
change. You can either omit the parameters completely or pass the objects
to be removed or added if available or just a count.
-
+
@param {Ember.Enumerable|Number} removing
An enumerable of the objects to be removed or the number of items to
be removed.
-
+
@param {Ember.Enumerable|Number} adding
An enumerable of the objects to be added or the number of items to be
added.
-
+
@returns {Ember.Enumerable} receiver
*/
enumerableContentWillChange: function(removing, adding) {
-
+
var removeCnt, addCnt, hasDelta;
if ('number' === typeof removing) removeCnt = removing;
else if (removing) removeCnt = get(removing, 'length');
else removeCnt = removing = -1;
if ('number' === typeof adding) addCnt = adding;
else if (adding) addCnt = get(adding,'length');
else addCnt = adding = -1;
-
+
hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
if (removing === -1) removing = null;
if (adding === -1) adding = null;
-
+
if (hasDelta) Ember.propertyWillChange(this, 'length');
Ember.sendEvent(this, '@enumerable:before', removing, adding);
return this;
},
-
+
/**
Invoke this method when the contents of your enumerable has changed.
This will notify any observers watching for content changes. If your are
implementing an ordered enumerable (such as an array), also pass the
start and end values where the content changed so that it can be used to
notify range observers.
- @param {Number} start
- optional start offset for the content change. For unordered
+ @param {Number} start
+ optional start offset for the content change. For unordered
enumerables, you should always pass -1.
-
+
@param {Enumerable} added
optional enumerable containing items that were added to the set. For
ordered enumerables, this should be an ordered array of items. If no
items were added you can pass null.
-
+
@param {Enumerable} removes
- optional enumerable containing items that were removed from the set.
- For ordered enumerables, this hsould be an ordered array of items. If
+ optional enumerable containing items that were removed from the set.
+ For ordered enumerables, this should be an ordered array of items. If
no items were removed you can pass null.
-
+
@returns {Object} receiver
*/
enumerableContentDidChange: function(removing, adding) {
var notify = this.propertyDidChange, removeCnt, addCnt, hasDelta;
@@ -7038,16 +8525,16 @@
else removeCnt = removing = -1;
if ('number' === typeof adding) addCnt = adding;
else if (adding) addCnt = get(adding, 'length');
else addCnt = adding = -1;
-
+
hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
if (removing === -1) removing = null;
if (adding === -1) adding = null;
-
+
Ember.sendEvent(this, '@enumerable:change', removing, adding);
if (hasDelta) Ember.propertyDidChange(this, 'length');
return this ;
}
@@ -7055,34 +8542,37 @@
}) ;
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
// ..........................................................
// HELPERS
-//
+//
-var get = Ember.get, set = Ember.set, meta = Ember.meta;
+var get = Ember.get, set = Ember.set, meta = Ember.meta, map = Ember.ArrayUtils.map;
+/** @private */
function none(obj) { return obj===null || obj===undefined; }
+/** @private */
function xform(target, method, params) {
method.call(target, params[0], params[2], params[3], params[4]);
}
// ..........................................................
// ARRAY
-//
+//
/**
@namespace
This module implements Observer-friendly Array-like behavior. This mixin is
picked up by the Array class as well as other controllers, etc. that want to
@@ -7115,11 +8605,11 @@
*/
Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.prototype */ {
/** @private - compatibility */
isSCArray: true,
-
+
/**
@field {Number} length
Your array must support the length property. Your replace methods should
set this property whenever it changes.
@@ -7139,15 +8629,26 @@
objectAt: function(idx) {
if ((idx < 0) || (idx>=get(this, 'length'))) return undefined ;
return get(this, idx);
},
+ /**
+ This returns the objects at the specified indexes, using objectAt.
+
+ @param {Array} indexes
+ An array of indexes of items to return.
+ */
+ objectsAt: function(indexes) {
+ var self = this;
+ return map(indexes, function(idx){ return self.objectAt(idx); });
+ },
+
/** @private (nodoc) - overrides Ember.Enumerable version */
nextObject: function(idx) {
return this.objectAt(idx);
},
-
+
/**
@field []
This is the handler for the special array content property. If you get
this property, it will return this. If you set this property it a new
@@ -7169,10 +8670,15 @@
/**
Returns a new array that is a slice of the receiver. This implementation
uses the observable array methods to retrieve the objects for the new
slice.
+ var arr = ['red', 'green', 'blue'];
+ arr.slice(0); => ['red', 'green', 'blue']
+ arr.slice(0, 2); => ['red', 'green']
+ arr.slice(1, 100); => ['green', 'blue']
+
@param beginIndex {Integer} (Optional) index to begin slicing from.
@param endIndex {Integer} (Optional) index to end the slice at.
@returns {Array} New array with specified slice
*/
slice: function(beginIndex, endIndex) {
@@ -7187,25 +8693,24 @@
},
/**
Returns the index of the given object's first occurrence.
If no startAt argument is given, the starting location to
- search is 0. If it's negative, will count backward from
+ search is 0. If it's negative, will count backward from
the end of the array. Returns -1 if no match is found.
+ var arr = ["a", "b", "c", "d", "a"];
+ arr.indexOf("a"); => 0
+ arr.indexOf("z"); => -1
+ arr.indexOf("a", 2); => 4
+ arr.indexOf("a", -1); => 4
+ arr.indexOf("b", 3); => -1
+ arr.indexOf("a", 100); => -1
+
@param {Object} object the item to search for
@param {Number} startAt optional starting location to search, default 0
@returns {Number} index or -1 if not found
-
- @example
- var arr = ["a", "b", "c", "d", "a"];
- arr.indexOf("a"); => 0
- arr.indexOf("z"); => -1
- arr.indexOf("a", 2); => 4
- arr.indexOf("a", -1); => 4
- arr.indexOf("b", 3); => -1
- arr.indexOf("a", 100); => -1
*/
indexOf: function(object, startAt) {
var idx, len = get(this, 'length');
if (startAt === undefined) startAt = 0;
@@ -7218,25 +8723,24 @@
},
/**
Returns the index of the given object's last occurrence.
If no startAt argument is given, the search starts from
- the last position. If it's negative, will count backward
+ the last position. If it's negative, will count backward
from the end of the array. Returns -1 if no match is found.
+ var arr = ["a", "b", "c", "d", "a"];
+ arr.lastIndexOf("a"); => 4
+ arr.lastIndexOf("z"); => -1
+ arr.lastIndexOf("a", 2); => 0
+ arr.lastIndexOf("a", -1); => 4
+ arr.lastIndexOf("b", 3); => 1
+ arr.lastIndexOf("a", 100); => 4
+
@param {Object} object the item to search for
@param {Number} startAt optional starting location to search, default 0
@returns {Number} index or -1 if not found
-
- @example
- var arr = ["a", "b", "c", "d", "a"];
- arr.lastIndexOf("a"); => 4
- arr.lastIndexOf("z"); => -1
- arr.lastIndexOf("a", 2); => 0
- arr.lastIndexOf("a", -1); => 4
- arr.lastIndexOf("b", 3); => 1
- arr.lastIndexOf("a", 100); => 4
*/
lastIndexOf: function(object, startAt) {
var idx, len = get(this, 'length');
if (startAt === undefined || startAt >= len) startAt = len-1;
@@ -7245,40 +8749,40 @@
for(idx=startAt;idx>=0;idx--) {
if (this.objectAt(idx) === object) return idx ;
}
return -1;
},
-
+
// ..........................................................
// ARRAY OBSERVERS
- //
-
+ //
+
/**
Adds an array observer to the receiving array. The array observer object
normally must implement two methods:
-
+
* `arrayWillChange(start, removeCount, addCount)` - This method will be
called just before the array is modified.
* `arrayDidChange(start, removeCount, addCount)` - This method will be
called just after the array is modified.
-
- Both callbacks will be passed the starting index of the change as well a
+
+ Both callbacks will be passed the starting index of the change as well a
a count of the items to be removed and added. You can use these callbacks
- to optionally inspect the array during the change, clear caches, or do
+ to optionally inspect the array during the change, clear caches, or do
any other bookkeeping necessary.
-
- In addition to passing a target, you can also include an options hash
+
+ In addition to passing a target, you can also include an options hash
which you can use to override the method names that will be invoked on the
target.
-
+
@param {Object} target
The observer object.
-
+
@param {Hash} opts
Optional hash of configuration options including willChange, didChange,
and a context option.
-
+
@returns {Ember.Array} receiver
*/
addArrayObserver: function(target, opts) {
var willChange = (opts && opts.willChange) || 'arrayWillChange',
didChange = (opts && opts.didChange) || 'arrayDidChange';
@@ -7288,19 +8792,19 @@
Ember.addListener(this, '@array:before', target, willChange, xform);
Ember.addListener(this, '@array:change', target, didChange, xform);
if (!hasObservers) Ember.propertyDidChange(this, 'hasArrayObservers');
return this;
},
-
+
/**
- Removes an array observer from the object if the observer is current
+ Removes an array observer from the object if the observer is current
registered. Calling this method multiple times with the same object will
have no effect.
-
+
@param {Object} target
The object observing the array.
-
+
@returns {Ember.Array} receiver
*/
removeArrayObserver: function(target, opts) {
var willChange = (opts && opts.willChange) || 'arrayWillChange',
didChange = (opts && opts.didChange) || 'arrayDidChange';
@@ -7310,36 +8814,36 @@
Ember.removeListener(this, '@array:before', target, willChange, xform);
Ember.removeListener(this, '@array:change', target, didChange, xform);
if (hasObservers) Ember.propertyDidChange(this, 'hasArrayObservers');
return this;
},
-
+
/**
Becomes true whenever the array currently has observers watching changes
on the array.
-
+
@property {Boolean}
*/
hasArrayObservers: Ember.computed(function() {
return Ember.hasListeners(this, '@array:change') || Ember.hasListeners(this, '@array:before');
}).property().cacheable(),
-
+
/**
- If you are implementing an object that supports Ember.Array, call this
+ If you are implementing an object that supports Ember.Array, call this
method just before the array content changes to notify any observers and
invalidate any related properties. Pass the starting index of the change
as well as a delta of the amounts to change.
-
+
@param {Number} startIdx
The starting index in the array that will change.
-
+
@param {Number} removeAmt
The number of items that will be removed. If you pass null assumes 0
-
+
@param {Number} addAmt
The number of items that will be added. If you pass null assumes 0.
-
+
@returns {Ember.Array} receiver
*/
arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
// if no args are passed assume everything changes
@@ -7359,29 +8863,29 @@
lim = startIdx+removeAmt;
for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
} else {
removing = removeAmt;
}
-
+
this.enumerableContentWillChange(removing, addAmt);
// Make sure the @each proxy is set up if anyone is observing @each
if (Ember.isWatching(this, '@each')) { get(this, '@each'); }
return this;
},
-
+
arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
// if no args are passed assume everything changes
if (startIdx===undefined) {
startIdx = 0;
removeAmt = addAmt = -1;
} else {
if (!removeAmt) removeAmt=0;
if (!addAmt) addAmt=0;
}
-
+
var adding, lim;
if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
adding = [];
lim = startIdx+addAmt;
for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
@@ -7391,179 +8895,398 @@
this.enumerableContentDidChange(removeAmt, adding);
Ember.sendEvent(this, '@array:change', startIdx, removeAmt, addAmt);
return this;
},
-
+
// ..........................................................
// ENUMERATED PROPERTIES
- //
-
+ //
+
/**
Returns a special object that can be used to observe individual properties
on the array. Just get an equivalent property on this object and it will
- return an enumerable that maps automatically to the named key on the
+ return an enumerable that maps automatically to the named key on the
member objects.
*/
'@each': Ember.computed(function() {
if (!this.__each) this.__each = new Ember.EachProxy(this);
return this.__each;
}).property().cacheable()
-
-
-
+
+
+
}) ;
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+/**
+ @namespace
+
+ Implements some standard methods for comparing objects. Add this mixin to
+ any class you create that can compare its instances.
+
+ You should implement the compare() method.
+
+ @since Ember 0.9
+*/
+Ember.Comparable = Ember.Mixin.create( /** @scope Ember.Comparable.prototype */{
+
+ /**
+ walk like a duck. Indicates that the object can be compared.
+
+ @type Boolean
+ @default true
+ @constant
+ */
+ isComparable: true,
+
+ /**
+ Override to return the result of the comparison of the two parameters. The
+ compare method should return:
+
+ - `-1` if `a < b`
+ - `0` if `a == b`
+ - `1` if `a > b`
+
+ Default implementation raises an exception.
+
+ @param a {Object} the first object to compare
+ @param b {Object} the second object to compare
+ @returns {Integer} the result of the comparison
+ */
+ compare: Ember.required(Function)
+
+});
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2010 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var get = Ember.get, set = Ember.set;
+
+/**
+ @namespace
+
+ Implements some standard methods for copying an object. Add this mixin to
+ any object you create that can create a copy of itself. This mixin is
+ added automatically to the built-in array.
+
+ You should generally implement the copy() method to return a copy of the
+ receiver.
+
+ Note that frozenCopy() will only work if you also implement Ember.Freezable.
+
+ @since Ember 0.9
+*/
+Ember.Copyable = Ember.Mixin.create(
+/** @scope Ember.Copyable.prototype */ {
+
+ /**
+ Override to return a copy of the receiver. Default implementation raises
+ an exception.
+
+ @param deep {Boolean} if true, a deep copy of the object should be made
+ @returns {Object} copy of receiver
+ */
+ copy: Ember.required(Function),
+
+ /**
+ If the object implements Ember.Freezable, then this will return a new copy
+ if the object is not frozen and the receiver if the object is frozen.
+
+ Raises an exception if you try to call this method on a object that does
+ not support freezing.
+
+ You should use this method whenever you want a copy of a freezable object
+ since a freezable object can simply return itself without actually
+ consuming more memory.
+
+ @returns {Object} copy of receiver or receiver
+ */
+ frozenCopy: function() {
+ if (Ember.Freezable && Ember.Freezable.detect(this)) {
+ return get(this, 'isFrozen') ? this : this.copy().freeze();
+ } else {
+ throw new Error(Ember.String.fmt("%@ does not support freezing", [this]));
+ }
+ }
+});
+
+
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2010 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
+
+
+
+
+var get = Ember.get, set = Ember.set;
+
+/**
+ @namespace
+
+ The Ember.Freezable mixin implements some basic methods for marking an object
+ as frozen. Once an object is frozen it should be read only. No changes
+ may be made the internal state of the object.
+
+ ## Enforcement
+
+ To fully support freezing in your subclass, you must include this mixin and
+ override any method that might alter any property on the object to instead
+ raise an exception. You can check the state of an object by checking the
+ isFrozen property.
+
+ Although future versions of JavaScript may support language-level freezing
+ object objects, that is not the case today. Even if an object is freezable,
+ it is still technically possible to modify the object, even though it could
+ break other parts of your application that do not expect a frozen object to
+ change. It is, therefore, very important that you always respect the
+ isFrozen property on all freezable objects.
+
+ ## Example Usage
+
+ The example below shows a simple object that implement the Ember.Freezable
+ protocol.
+
+ Contact = Ember.Object.extend(Ember.Freezable, {
+
+ firstName: null,
+
+ lastName: null,
+
+ // swaps the names
+ swapNames: function() {
+ if (this.get('isFrozen')) throw Ember.FROZEN_ERROR;
+ var tmp = this.get('firstName');
+ this.set('firstName', this.get('lastName'));
+ this.set('lastName', tmp);
+ return this;
+ }
+
+ });
+
+ c = Context.create({ firstName: "John", lastName: "Doe" });
+ c.swapNames(); => returns c
+ c.freeze();
+ c.swapNames(); => EXCEPTION
+
+ ## Copying
+
+ Usually the Ember.Freezable protocol is implemented in cooperation with the
+ Ember.Copyable protocol, which defines a frozenCopy() method that will return
+ a frozen object, if the object implements this method as well.
+
+ @since Ember 0.9
+*/
+Ember.Freezable = Ember.Mixin.create(
+/** @scope Ember.Freezable.prototype */ {
+
+ /**
+ Set to true when the object is frozen. Use this property to detect whether
+ your object is frozen or not.
+
+ @property {Boolean}
+ */
+ isFrozen: false,
+
+ /**
+ Freezes the object. Once this method has been called the object should
+ no longer allow any properties to be edited.
+
+ @returns {Object} receiver
+ */
+ freeze: function() {
+ if (get(this, 'isFrozen')) return this;
+ set(this, 'isFrozen', true);
+ return this;
+ }
+
+});
+
+Ember.FROZEN_ERROR = "Frozen object cannot be modified.";
+
+
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
+var forEach = Ember.ArrayUtils.forEach;
+
/**
@class
This mixin defines the API for modifying generic enumerables. These methods
- can be applied to an object regardless of whether it is ordered or
+ can be applied to an object regardless of whether it is ordered or
unordered.
-
+
Note that an Enumerable can change even if it does not implement this mixin.
- For example, a MappedEnumerable cannot be directly modified but if its
+ For example, a MappedEnumerable cannot be directly modified but if its
underlying enumerable changes, it will change also.
## Adding Objects
-
- To add an object to an enumerable, use the addObject() method. This
- method will only add the object to the enumerable if the object is not
+
+ To add an object to an enumerable, use the addObject() method. This
+ method will only add the object to the enumerable if the object is not
already present and the object if of a type supported by the enumerable.
-
- javascript:
+
set.addObject(contact);
-
+
## Removing Objects
-
+
To remove an object form an enumerable, use the removeObject() method. This
will only remove the object if it is already in the enumerable, otherwise
this method has no effect.
-
- javascript:
+
set.removeObject(contact);
-
+
## Implementing In Your Own Code
-
+
If you are implementing an object and want to support this API, just include
this mixin in your class and implement the required methods. In your unit
tests, be sure to apply the Ember.MutableEnumerableTests to your object.
-
+
@extends Ember.Mixin
@extends Ember.Enumerable
*/
-Ember.MutableEnumerable = Ember.Mixin.create(Ember.Enumerable,
+Ember.MutableEnumerable = Ember.Mixin.create(Ember.Enumerable,
/** @scope Ember.MutableEnumerable.prototype */ {
-
+
/**
__Required.__ You must implement this method to apply this mixin.
-
- Attempts to add the passed object to the receiver if the object is not
+
+ Attempts to add the passed object to the receiver if the object is not
already present in the collection. If the object is present, this method
- has no effect.
-
- If the passed object is of a type not supported by the receiver (for
- example if you pass an object to an IndexSet) then this method should
- raise an exception.
-
+ has no effect.
+
+ If the passed object is of a type not supported by the receiver
+ then this method should raise an exception.
+
@param {Object} object
The object to add to the enumerable.
-
+
@returns {Object} the passed object
*/
addObject: Ember.required(Function),
/**
Adds each object in the passed enumerable to the receiver.
- @param {Ember.Enumerable} objects the objects to remove
+ @param {Ember.Enumerable} objects the objects to add.
@returns {Object} receiver
*/
addObjects: function(objects) {
Ember.beginPropertyChanges(this);
- objects.forEach(function(obj) { this.addObject(obj); }, this);
+ forEach(objects, function(obj) { this.addObject(obj); }, this);
Ember.endPropertyChanges(this);
return this;
},
/**
__Required.__ You must implement this method to apply this mixin.
-
+
Attempts to remove the passed object from the receiver collection if the
object is in present in the collection. If the object is not present,
this method has no effect.
-
- If the passed object is of a type not supported by the receiver (for
- example if you pass an object to an IndexSet) then this method should
- raise an exception.
-
+
+ If the passed object is of a type not supported by the receiver
+ then this method should raise an exception.
+
@param {Object} object
The object to remove from the enumerable.
-
+
@returns {Object} the passed object
*/
removeObject: Ember.required(Function),
-
-
+
+
/**
Removes each objects in the passed enumerable from the receiver.
@param {Ember.Enumerable} objects the objects to remove
@returns {Object} receiver
*/
removeObjects: function(objects) {
Ember.beginPropertyChanges(this);
- objects.forEach(function(obj) { this.removeObject(obj); }, this);
+ forEach(objects, function(obj) { this.removeObject(obj); }, this);
Ember.endPropertyChanges(this);
return this;
}
-
+
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
// ..........................................................
// CONSTANTS
-//
+//
var OUT_OF_RANGE_EXCEPTION = "Index out of range" ;
var EMPTY = [];
// ..........................................................
// HELPERS
-//
+//
-var get = Ember.get, set = Ember.set;
+var get = Ember.get, set = Ember.set, forEach = Ember.ArrayUtils.forEach;
/**
@class
This mixin defines the API for modifying array-like objects. These methods
can be applied only to a collection that keeps its items in an ordered set.
-
+
Note that an Array can change even if it does not implement this mixin.
- For example, a SparyArray may not be directly modified but if its
- underlying enumerable changes, it will change also.
+ For example, one might implement a SparseArray that cannot be directly
+ modified, but if its underlying enumerable changes, it will change also.
@extends Ember.Mixin
@extends Ember.Array
@extends Ember.MutableEnumerable
*/
@@ -7571,32 +9294,54 @@
/** @scope Ember.MutableArray.prototype */ {
/**
__Required.__ You must implement this method to apply this mixin.
- This is one of the primitves you must implement to support Ember.Array. You
+ This is one of the primitives you must implement to support Ember.Array. You
should replace amt objects started at idx with the objects in the passed
array. You should also call this.enumerableContentDidChange() ;
@param {Number} idx
- Starting index in the array to replace. If idx >= length, then append
+ Starting index in the array to replace. If idx >= length, then append
to the end of the array.
@param {Number} amt
Number of elements that should be removed from the array, starting at
*idx*.
@param {Array} objects
- An array of zero or more objects that should be inserted into the array
+ An array of zero or more objects that should be inserted into the array
at *idx*
*/
replace: Ember.required(),
/**
+ Remove all elements from self. This is useful if you
+ want to reuse an existing array without having to recreate it.
+
+ var colors = ["red", "green", "blue"];
+ color.length(); => 3
+ colors.clear(); => []
+ colors.length(); => 0
+
+ @returns {Ember.Array} An empty Array.
+ */
+ clear: function () {
+ var len = get(this, 'length');
+ if (len === 0) return this;
+ this.replace(0, len, EMPTY);
+ return this;
+ },
+
+ /**
This will use the primitive replace() method to insert an object at the
specified index.
+ var colors = ["red", "green", "blue"];
+ colors.insertAt(2, "yellow"); => ["red", "green", "yellow", "blue"]
+ colors.insertAt(5, "orange"); => Error: Index out of range
+
@param {Number} idx index of insert the object at.
@param {Object} object object to insert
*/
insertAt: function(idx, object) {
if (idx > get(this, 'length')) throw new Error(OUT_OF_RANGE_EXCEPTION) ;
@@ -7604,16 +9349,20 @@
return this ;
},
/**
Remove an object at the specified index using the replace() primitive
- method. You can pass either a single index, a start and a length or an
- index set.
+ method. You can pass either a single index, or a start and a length.
- If you pass a single index or a start and length that is beyond the
+ If you pass a start and length that is beyond the
length this method will throw an Ember.OUT_OF_RANGE_EXCEPTION
+ var colors = ["red", "green", "blue", "yellow", "orange"];
+ colors.removeAt(0); => ["green", "blue", "yellow", "orange"]
+ colors.removeAt(2, 2); => ["green", "blue"]
+ colors.removeAt(4, 2); => Error: Index out of range
+
@param {Number|Ember.IndexSet} start index, start of range, or index set
@param {Number} len length of passing range
@returns {Object} receiver
*/
removeAt: function(start, len) {
@@ -7629,36 +9378,35 @@
// fast case
if (len === undefined) len = 1;
this.replace(start, len, EMPTY);
}
- // TODO: Reintroduce Ember.IndexSet support
- // this.beginPropertyChanges();
- // start.forEachRange(function(start, length) {
- // start -= delta ;
- // delta += length ;
- // this.replace(start, length, empty); // remove!
- // }, this);
- // this.endPropertyChanges();
-
return this ;
},
/**
Push the object onto the end of the array. Works just like push() but it
is KVO-compliant.
+
+ var colors = ["red", "green", "blue"];
+ colors.pushObject("black"); => ["red", "green", "blue", "black"]
+ colors.pushObject(["yellow", "orange"]); => ["red", "green", "blue", "black", ["yellow", "orange"]]
+
*/
pushObject: function(obj) {
this.insertAt(get(this, 'length'), obj) ;
return obj ;
},
-
/**
Add the objects in the passed numerable to the end of the array. Defers
notifying observers of the change until all objects are added.
+ var colors = ["red", "green", "blue"];
+ colors.pushObjects("black"); => ["red", "green", "blue", "black"]
+ colors.pushObjects(["yellow", "orange"]); => ["red", "green", "blue", "black", "yellow", "orange"]
+
@param {Ember.Enumerable} objects the objects to add
@returns {Ember.Array} receiver
*/
pushObjects: function(objects) {
this.replace(get(this, 'length'), 0, objects);
@@ -7666,10 +9414,15 @@
},
/**
Pop object from array or nil if none are left. Works just like pop() but
it is KVO-compliant.
+
+ var colors = ["red", "green", "blue"];
+ colors.popObject(); => "blue"
+ console.log(colors); => ["red", "green"]
+
*/
popObject: function() {
var len = get(this, 'length') ;
if (len === 0) return null ;
@@ -7679,10 +9432,15 @@
},
/**
Shift an object from start of array or nil if none are left. Works just
like shift() but it is KVO-compliant.
+
+ var colors = ["red", "green", "blue"];
+ colors.shiftObject(); => "red"
+ console.log(colors); => ["green", "blue"]
+
*/
shiftObject: function() {
if (get(this, 'length') === 0) return null ;
var ret = this.objectAt(0) ;
this.removeAt(0) ;
@@ -7690,115 +9448,166 @@
},
/**
Unshift an object to start of array. Works just like unshift() but it is
KVO-compliant.
+
+ var colors = ["red", "green", "blue"];
+ colors.unshiftObject("yellow"); => ["yellow", "red", "green", "blue"]
+ colors.unshiftObject(["black", "white"]); => [["black", "white"], "yellow", "red", "green", "blue"]
+
*/
unshiftObject: function(obj) {
this.insertAt(0, obj) ;
return obj ;
},
-
/**
Adds the named objects to the beginning of the array. Defers notifying
observers until all objects have been added.
+ var colors = ["red", "green", "blue"];
+ colors.unshiftObjects(["black", "white"]); => ["black", "white", "red", "green", "blue"]
+ colors.unshiftObjects("yellow"); => Type Error: 'undefined' is not a function
+
@param {Ember.Enumerable} objects the objects to add
@returns {Ember.Array} receiver
*/
unshiftObjects: function(objects) {
this.beginPropertyChanges();
- objects.forEach(function(obj) { this.unshiftObject(obj); }, this);
+ forEach(objects, function(obj) { this.unshiftObject(obj); }, this);
this.endPropertyChanges();
return this;
},
-
+
// ..........................................................
// IMPLEMENT Ember.MutableEnumerable
- //
+ //
/** @private (nodoc) */
removeObject: function(obj) {
var loc = get(this, 'length') || 0;
while(--loc >= 0) {
var curObject = this.objectAt(loc) ;
if (curObject === obj) this.removeAt(loc) ;
}
return this ;
},
-
+
/** @private (nodoc) */
addObject: function(obj) {
if (!this.contains(obj)) this.pushObject(obj);
return this ;
}
-
+
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
var get = Ember.get, set = Ember.set;
-
+
/**
@class
- Restores some of the Ember 1.x Ember.Observable mixin API. The new property
- observing system does not require Ember.Observable to be applied anymore.
- Instead, on most browsers you can just access properties directly. For
- code that needs to run on IE7 or IE8 you should use Ember.get() and Ember.set()
- instead.
+ ## Overview
- If you have older code and you want to bring back the older Ember 1.x observable
- API, you can do so by readding Ember.Observable to Ember.Object like so:
+ This mixin provides properties and property observing functionality, core
+ features of the Ember object model.
- Ember.Object.reopen(Ember.Observable);
+ Properties and observers allow one object to observe changes to a
+ property on another object. This is one of the fundamental ways that
+ models, controllers and views communicate with each other in an Ember
+ application.
+
+ Any object that has this mixin applied can be used in observer
+ operations. That includes Ember.Object and most objects you will
+ interact with as you write your Ember application.
+
+ Note that you will not generally apply this mixin to classes yourself,
+ but you will use the features provided by this module frequently, so it
+ is important to understand how to use it.
+
+ ## Using get() and set()
+
+ Because of Ember's support for bindings and observers, you will always
+ access properties using the get method, and set properties using the
+ set method. This allows the observing objects to be notified and
+ computed properties to be handled properly.
+
+ More documentation about `get` and `set` are below.
+
+ ## Observing Property Changes
+
+ You typically observe property changes simply by adding the `observes`
+ call to the end of your method declarations in classes that you write.
+ For example:
+
+ Ember.Object.create({
+ valueObserver: function() {
+ // Executes whenever the "value" property changes
+ }.observes('value')
+ });
- You will then be able to use the traditional get(), set() and other
- observable methods on your objects.
+ Although this is the most common way to add an observer, this capability
+ is actually built into the Ember.Object class on top of two methods
+ defined in this mixin: `addObserver` and `removeObserver`. You can use
+ these two methods to add and remove observers yourself if you need to
+ do so at runtime.
+ To add an observer for a property, call:
+
+ object.addObserver('propertyKey', targetObject, targetAction)
+
+ This will call the `targetAction` method on the `targetObject` to be called
+ whenever the value of the `propertyKey` changes.
+
@extends Ember.Mixin
*/
Ember.Observable = Ember.Mixin.create(/** @scope Ember.Observable.prototype */ {
/** @private - compatibility */
isObserverable: true,
-
+
/**
- Retrieves the value of key from the object.
+ Retrieves the value of a property from the object.
- This method is generally very similar to using object[key] or object.key,
+ This method is usually similar to using object[keyName] or object.keyName,
however it supports both computed properties and the unknownProperty
handler.
+
+ Because `get` unifies the syntax for accessing all these kinds
+ of properties, it can make many refactorings easier, such as replacing a
+ simple property with a computed property, or vice versa.
- ## Computed Properties
+ ### Computed Properties
- Computed properties are methods defined with the property() modifier
+ Computed properties are methods defined with the `property` modifier
declared at the end, such as:
fullName: function() {
return this.getEach('firstName', 'lastName').compact().join(' ');
}.property('firstName', 'lastName')
- When you call get() on a computed property, the property function will be
+ When you call `get` on a computed property, the function will be
called and the return value will be returned instead of the function
itself.
- ## Unknown Properties
+ ### Unknown Properties
- Likewise, if you try to call get() on a property whose values is
+ Likewise, if you try to call `get` on a property whose value is
undefined, the unknownProperty() method will be called on the object.
- If this method reutrns any value other than undefined, it will be returned
+ If this method returns any value other than undefined, it will be returned
instead. This allows you to implement "virtual" properties that are
not defined upfront.
@param {String} key The property to retrieve
@returns {Object} The property value or undefined.
@@ -7807,60 +9616,68 @@
return get(this, keyName);
},
/**
To get multiple properties at once, call getProperties
- with a list of strings:
+ with a list of strings or an array:
- record.getProperties('firstName', 'lastName', 'zipCode');
+ record.getProperties('firstName', 'lastName', 'zipCode'); // => { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
- @param {String...} list of keys to get
+ is equivalent to:
+
+ record.getProperties(['firstName', 'lastName', 'zipCode']); // => { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+
+ @param {String...|Array} list of keys to get
@returns {Hash}
*/
getProperties: function() {
var ret = {};
- for(var i = 0; i < arguments.length; i++) {
- ret[arguments[i]] = get(this, arguments[i]);
+ var propertyNames = arguments;
+ if (arguments.length === 1 && Ember.typeOf(arguments[0]) === 'array') {
+ propertyNames = arguments[0];
}
+ for(var i = 0; i < propertyNames.length; i++) {
+ ret[propertyNames[i]] = get(this, propertyNames[i]);
+ }
return ret;
},
-
+
/**
Sets the key equal to value.
This method is generally very similar to calling object[key] = value or
object.key = value, except that it provides support for computed
properties, the unknownProperty() method and property observers.
- ## Computed Properties
+ ### Computed Properties
If you try to set a value on a key that has a computed property handler
defined (see the get() method for an example), then set() will call
that method, passing both the value and key instead of simply changing
the value itself. This is useful for those times when you need to
implement a property that is composed of one or more member
properties.
- ## Unknown Properties
+ ### Unknown Properties
If you try to set a value on a key that is undefined in the target
object, then the unknownProperty() handler will be called instead. This
gives you an opportunity to implement complex "virtual" properties that
- are not predefined on the obejct. If unknownProperty() returns
+ are not predefined on the object. If unknownProperty() returns
undefined, then set() will simply set the value on the object.
- ## Property Observers
+ ### Property Observers
In addition to changing the property, set() will also register a
property change with the object. Unless you have placed this call
inside of a beginPropertyChanges() and endPropertyChanges(), any "local"
observers (i.e. observer methods declared on the same object), will be
called immediately. Any "remote" observers (i.e. observer methods
declared on another object) will be placed in a queue and called at a
- later time in a coelesced manner.
+ later time in a coalesced manner.
- ## Chaining
+ ### Chaining
In addition to property changes, set() returns the value of the object
itself so you can do chaining like this:
record.set('firstName', 'Charles').set('lastName', 'Jolley');
@@ -7871,64 +9688,58 @@
*/
set: function(keyName, value) {
set(this, keyName, value);
return this;
},
-
+
/**
To set multiple properties at once, call setProperties
with a Hash:
record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
@param {Hash} hash the hash of keys and values to set
@returns {Ember.Observable}
*/
setProperties: function(hash) {
- var self = this;
- Ember.changeProperties(function(){
- for(var prop in hash) {
- if (hash.hasOwnProperty(prop)) set(self, prop, hash[prop]);
- }
- });
- return this;
+ return Ember.setProperties(this, hash);
},
/**
Begins a grouping of property changes.
You can use this method to group property changes so that notifications
will not be sent until the changes are finished. If you plan to make a
large number of changes to an object at one time, you should call this
- method at the beginning of the changes to suspend change notifications.
- When you are done making changes, call endPropertyChanges() to allow
- notification to resume.
+ method at the beginning of the changes to begin deferring change
+ notifications. When you are done making changes, call endPropertyChanges()
+ to deliver the deferred change notifications and end deferring.
@returns {Ember.Observable}
*/
beginPropertyChanges: function() {
Ember.beginPropertyChanges();
return this;
},
-
+
/**
Ends a grouping of property changes.
You can use this method to group property changes so that notifications
will not be sent until the changes are finished. If you plan to make a
large number of changes to an object at one time, you should call
- beginPropertyChanges() at the beginning of the changes to suspend change
- notifications. When you are done making changes, call this method to allow
- notification to resume.
+ beginPropertyChanges() at the beginning of the changes to defer change
+ notifications. When you are done making changes, call this method to
+ deliver the deferred change notifications and end deferring.
@returns {Ember.Observable}
*/
endPropertyChanges: function() {
Ember.endPropertyChanges();
return this;
},
-
+
/**
Notify the observer system that a property is about to change.
Sometimes you need to change a value directly or indirectly without
actually calling get() or set() on it. In this case, you can use this
@@ -7945,11 +9756,11 @@
*/
propertyWillChange: function(keyName){
Ember.propertyWillChange(this, keyName);
return this;
},
-
+
/**
Notify the observer system that a property has just changed.
Sometimes you need to change a value directly or indirectly without
actually calling get() or set() on it. In this case, you can use this
@@ -7959,25 +9770,30 @@
Note that you must always call propertyWillChange and propertyDidChange as
a pair. If you do not, it may get the property change groups out of order
and cause notifications to be delivered more often than you would like.
- @param {String} key The property key that has just changed.
- @param {Object} value The new value of the key. May be null.
- @param {Boolean} _keepCache Private property
+ @param {String} keyName The property key that has just changed.
@returns {Ember.Observable}
*/
propertyDidChange: function(keyName) {
Ember.propertyDidChange(this, keyName);
return this;
},
+ /**
+ Convenience method to call `propertyWillChange` and `propertyDidChange` in
+ succession.
+
+ @param {String} keyName The property key to be notified about.
+ @returns {Ember.Observable}
+ */
notifyPropertyChange: function(keyName) {
this.propertyWillChange(keyName);
this.propertyDidChange(keyName);
return this;
- },
+ },
/**
Adds an observer on a property.
This is the core method used to register an observer for a property.
@@ -7991,11 +9807,11 @@
context will be passed to your observer method whenever it is triggered.
Note that if you add the same target/method pair on a key multiple times
with different context parameters, your observer will only be called once
with the last context you passed.
- ## Observer Methods
+ ### Observer Methods
Observer methods you pass should generally have the following signature if
you do not pass a "context" parameter:
fooDidChange: function(sender, key, value, rev);
@@ -8021,27 +9837,27 @@
@returns {Ember.Object} self
*/
addObserver: function(key, target, method) {
Ember.addObserver(this, key, target, method);
},
-
+
/**
Remove an observer you have previously registered on this object. Pass
the same key, target, and method you passed to addObserver() and your
target will no longer receive notifications.
@param {String} key The key to observer
@param {Object} target The target object to invoke
@param {String|Function} method The method to invoke.
- @returns {Ember.Observable} reciever
+ @returns {Ember.Observable} receiver
*/
removeObserver: function(key, target, method) {
Ember.removeObserver(this, key, target, method);
},
-
+
/**
- Returns YES if the object currently has observers registered for a
+ Returns true if the object currently has observers registered for a
particular key. You can use this method to potentially defer performing
an expensive action until someone begins observing a particular property
on the object.
@param {String} key Key to check
@@ -8049,114 +9865,320 @@
*/
hasObserverFor: function(key) {
return Ember.hasListeners(this, key+':change');
},
+ /**
+ This method will be called when a client attempts to get the value of a
+ property that has not been defined in one of the typical ways. Override
+ this method to create "virtual" properties.
+
+ @param {String} key The name of the unknown property that was requested.
+ @returns {Object} The property value or undefined. Default is undefined.
+ */
unknownProperty: function(key) {
return undefined;
},
-
+
+ /**
+ This method will be called when a client attempts to set the value of a
+ property that has not been defined in one of the typical ways. Override
+ this method to create "virtual" properties.
+
+ @param {String} key The name of the unknown property to be set.
+ @param {Object} value The value the unknown property is to be set to.
+ */
setUnknownProperty: function(key, value) {
this[key] = value;
},
-
+
+ /**
+ This is like `get`, but allows you to pass in a dot-separated property
+ path.
+
+ person.getPath('address.zip'); // return the zip
+ person.getPath('children.firstObject.age'); // return the first kid's age
+
+ This reads much better than chained `get` calls.
+
+ @param {String} path The property path to retrieve
+ @returns {Object} The property value or undefined.
+ */
getPath: function(path) {
return Ember.getPath(this, path);
},
-
+
+ /**
+ This is like `set`, but allows you to specify the property you want to
+ set as a dot-separated property path.
+
+ person.setPath('address.zip', 10011); // set the zip to 10011
+ person.setPath('children.firstObject.age', 6); // set the first kid's age to 6
+
+ This is not as commonly used as `getPath`, but it can be useful.
+
+ @param {String} path The path to the property that will be set
+ @param {Object} value The value to set or null.
+ @returns {Ember.Observable}
+ */
setPath: function(path, value) {
Ember.setPath(this, path, value);
return this;
},
-
+
+ /**
+ Retrieves the value of a property, or a default value in the case that the property
+ returns undefined.
+
+ person.getWithDefault('lastName', 'Doe');
+
+ @param {String} keyName The name of the property to retrieve
+ @param {Object} defaultValue The value to return if the property value is undefined
+ @returns {Object} The property value or the defaultValue.
+ */
+ getWithDefault: function(keyName, defaultValue) {
+ return Ember.getWithDefault(this, keyName, defaultValue);
+ },
+
+ /**
+ Set the value of a property to the current value plus some amount.
+
+ person.incrementProperty('age');
+ team.incrementProperty('score', 2);
+
+ @param {String} keyName The name of the property to increment
+ @param {Object} increment The amount to increment by. Defaults to 1
+ @returns {Object} The new property value
+ */
incrementProperty: function(keyName, increment) {
if (!increment) { increment = 1; }
set(this, keyName, (get(this, keyName) || 0)+increment);
return get(this, keyName);
},
+ /**
+ Set the value of a property to the current value minus some amount.
+
+ player.decrementProperty('lives');
+ orc.decrementProperty('health', 5);
+
+ @param {String} keyName The name of the property to decrement
+ @param {Object} increment The amount to decrement by. Defaults to 1
+ @returns {Object} The new property value
+ */
decrementProperty: function(keyName, increment) {
if (!increment) { increment = 1; }
set(this, keyName, (get(this, keyName) || 0)-increment);
return get(this, keyName);
},
-
+
+ /**
+ Set the value of a boolean property to the opposite of it's
+ current value.
+
+ starship.toggleProperty('warpDriveEnaged');
+
+ @param {String} keyName The name of the property to toggle
+ @returns {Object} The new property value
+ */
toggleProperty: function(keyName) {
set(this, keyName, !get(this, keyName));
return get(this, keyName);
},
-
+
+ /**
+ Returns the cached value of a computed property, if it exists.
+ This allows you to inspect the value of a computed property
+ without accidentally invoking it if it is intended to be
+ generated lazily.
+
+ @param {String} keyName
+ @returns {Object} The cached value of the computed property, if any
+ */
+ cacheFor: function(keyName) {
+ return Ember.cacheFor(this, keyName);
+ },
+
+ /** @private - intended for debugging purposes */
observersForKey: function(keyName) {
return Ember.observersFor(this, keyName);
}
-
});
-})({});
+})();
-(function(exports) {
+
+(function() {
+var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
+
+Ember.TargetActionSupport = Ember.Mixin.create({
+ target: null,
+ action: null,
+
+ targetObject: Ember.computed(function() {
+ var target = get(this, 'target');
+
+ if (Ember.typeOf(target) === "string") {
+ // TODO: Remove the false when deprecation is done
+ var value = getPath(this, target, false);
+ if (value === undefined) { value = getPath(window, target); }
+ return value;
+ } else {
+ return target;
+ }
+ }).property('target').cacheable(),
+
+ triggerAction: function() {
+ var action = get(this, 'action'),
+ target = get(this, 'targetObject');
+
+ if (target && action) {
+ var ret;
+
+ if (typeof target.send === 'function') {
+ ret = target.send(action, this);
+ } else {
+ if (typeof action === 'string') {
+ action = target[action];
+ }
+ ret = action.call(target, this);
+ }
+ if (ret !== false) ret = true;
+
+ return ret;
+ } else {
+ return false;
+ }
+ }
+});
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set, a_slice = Array.prototype.slice;
+
+/** @private */
+function xform(target, method, params) {
+ var args = a_slice.call(params, 2);
+ method.apply(target, args);
+}
+
+Ember.Evented = Ember.Mixin.create({
+ on: function(name, target, method) {
+ if (!method) {
+ method = target;
+ target = null;
+ }
+
+ Ember.addListener(this, name, target, method, xform);
+ },
+
+ fire: function(name) {
+ Ember.sendEvent.apply(null, [this, name].concat(a_slice.call(arguments, 1)));
+ },
+
+ off: function(name, target, method) {
+ Ember.removeListener(this, name, target, method);
+ }
+});
+
+})();
+
+
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
+})();
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
+
+
// NOTE: this object should never be included directly. Instead use Ember.
// Ember.Object. We only define this separately so that Ember.Set can depend on it
var rewatch = Ember.rewatch;
var classToString = Ember.Mixin.prototype.toString;
var set = Ember.set, get = Ember.get;
var o_create = Ember.platform.create,
+ o_defineProperty = Ember.platform.defineProperty,
+ a_slice = Array.prototype.slice,
meta = Ember.meta;
+/** @private */
function makeCtor() {
// Note: avoid accessing any properties on the object since it makes the
// method a lot faster. This is glue code so we want it to be as fast as
// possible.
- var isPrepared = false, initMixins, init = false, hasChains = false;
+ var wasApplied = false, initMixins, init = false, hasChains = false;
var Class = function() {
- if (!isPrepared) { get(Class, 'proto'); } // prepare prototype...
+ if (!wasApplied) { Class.proto(); } // prepare prototype...
if (initMixins) {
this.reopen.apply(this, initMixins);
initMixins = null;
- rewatch(this); // ålways rewatch just in case
+ rewatch(this); // always rewatch just in case
this.init.apply(this, arguments);
} else {
if (hasChains) {
rewatch(this);
} else {
- this[Ember.GUID_KEY] = undefined;
+ Ember.GUID_DESC.value = undefined;
+ o_defineProperty(this, Ember.GUID_KEY, Ember.GUID_DESC);
}
if (init===false) { init = this.init; } // cache for later instantiations
+ Ember.GUID_DESC.value = undefined;
+ o_defineProperty(this, '_super', Ember.GUID_DESC);
init.apply(this, arguments);
}
};
Class.toString = classToString;
- Class._prototypeMixinDidChange = function() { isPrepared = false; };
+ Class.willReopen = function() {
+ if (wasApplied) {
+ Class.PrototypeMixin = Ember.Mixin.create(Class.PrototypeMixin);
+ }
+
+ wasApplied = false;
+ };
Class._initMixins = function(args) { initMixins = args; };
- Ember.defineProperty(Class, 'proto', Ember.computed(function() {
- if (!isPrepared) {
- isPrepared = true;
+ Class.proto = function() {
+ var superclass = Class.superclass;
+ if (superclass) { superclass.proto(); }
+
+ if (!wasApplied) {
+ wasApplied = true;
Class.PrototypeMixin.applyPartial(Class.prototype);
+ Ember.rewatch(Class.prototype); // setup watch chains if needed.
hasChains = !!meta(Class.prototype, false).chains; // avoid rewatch
}
+
return this.prototype;
- }));
+ };
return Class;
}
@@ -8170,14 +10192,19 @@
return this;
},
isInstance: true,
+ /** @private */
init: function() {},
+ /** @field */
isDestroyed: false,
+ /** @field */
+ isDestroying: false,
+
/**
Destroys an object by setting the isDestroyed flag and removing its
metadata, which effectively destroys observers and bindings.
If you try to set a property on a destroyed object, an exception will be
@@ -8187,10 +10214,16 @@
happen immediately.
@returns {Ember.Object} receiver
*/
destroy: function() {
+ if (this.isDestroying) { return; }
+
+ this.isDestroying = true;
+
+ if (this.willDestroy) { this.willDestroy(); }
+
set(this, 'isDestroyed', true);
Ember.run.schedule('destroy', this, this._scheduledDestroy);
return this;
},
@@ -8200,10 +10233,11 @@
@private
*/
_scheduledDestroy: function() {
Ember.destroy(this);
+ if (this.didDestroy) { this.didDestroy(); }
},
bind: function(to, from) {
if (!(from instanceof Ember.Binding)) { from = Ember.Binding.from(from); }
from.to(to).connect(this);
@@ -8243,11 +10277,10 @@
proto = Class.prototype = o_create(this.prototype);
proto.constructor = Class;
Ember.generateGuid(proto, 'ember');
meta(proto).proto = proto; // this will disable observers on prototype
- Ember.rewatch(proto); // setup watch chains if needed.
Class.subclasses = Ember.Set ? new Ember.Set() : null;
if (this.subclasses) { this.subclasses.add(Class); }
@@ -8260,13 +10293,13 @@
if (arguments.length>0) { this._initMixins(arguments); }
return new C();
},
reopen: function() {
+ this.willReopen();
var PrototypeMixin = this.PrototypeMixin;
PrototypeMixin.reopen.apply(PrototypeMixin, arguments);
- this._prototypeMixinDidChange();
return this;
},
reopenClass: function() {
var ClassMixin = this.ClassMixin;
@@ -8283,795 +10316,77 @@
}
return false;
},
detectInstance: function(obj) {
- return this.PrototypeMixin.detect(obj);
- }
-
-});
-
-CoreObject.ClassMixin = ClassMixin;
-ClassMixin.apply(CoreObject);
-
-/**
- @class
-*/
-Ember.CoreObject = CoreObject;
-
-
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/*globals ENV ember_assert */
-// ........................................
-// GLOBAL CONSTANTS
-//
-
-/**
- @name YES
- @static
- @type Boolean
- @default true
- @constant
-*/
-YES = true;
-
-/**
- @name NO
- @static
- @type Boolean
- @default NO
- @constant
-*/
-NO = false;
-
-// ensure no undefined errors in browsers where console doesn't exist
-if (typeof console === 'undefined') {
- window.console = {};
- console.log = console.info = console.warn = console.error = function() {};
-}
-
-// ..........................................................
-// BOOTSTRAP
-//
-
-/**
- @static
- @type Boolean
- @default YES
- @constant
-
- Determines whether Ember should enhances some built-in object
- prototypes to provide a more friendly API. If enabled, a few methods
- will be added to Function, String, and Array. Object.prototype will not be
- enhanced, which is the one that causes most troubles for people.
-
- In general we recommend leaving this option set to true since it rarely
- conflicts with other code. If you need to turn it off however, you can
- define an ENV.EXTEND_PROTOTYPES config to disable it.
-*/
-Ember.EXTEND_PROTOTYPES = (Ember.ENV.EXTEND_PROTOTYPES !== false);
-
-// ........................................
-// TYPING & ARRAY MESSAGING
-//
-
-var TYPE_MAP = {};
-var t ="Boolean Number String Function Array Date RegExp Object".split(" ");
-t.forEach(function(name) {
- TYPE_MAP[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-var toString = Object.prototype.toString;
-
-/**
- Returns a consistent type for the passed item.
-
- Use this instead of the built-in Ember.typeOf() to get the type of an item.
- It will return the same result across all browsers and includes a bit
- more detail. Here is what will be returned:
-
- | Return Value Constant | Meaning |
- | 'string' | String primitive |
- | 'number' | Number primitive |
- | 'boolean' | Boolean primitive |
- | 'null' | Null value |
- | 'undefined' | Undefined value |
- | 'function' | A function |
- | 'array' | An instance of Array |
- | 'class' | A Ember class (created using Ember.Object.extend()) |
- | 'instance' | A Ember object instance |
- | 'error' | An instance of the Error object |
- | 'object' | A JavaScript object not inheriting from Ember.Object |
-
- @param item {Object} the item to check
- @returns {String} the type
-*/
-Ember.typeOf = function(item) {
- var ret;
-
- ret = item==null ? String(item) : TYPE_MAP[toString.call(item)]||'object';
-
- if (ret === 'function') {
- if (Ember.Object && Ember.Object.detect(item)) ret = 'class';
- } else if (ret === 'object') {
- if (item instanceof Error) ret = 'error';
- else if (Ember.Object && item instanceof Ember.Object) ret = 'instance';
- else ret = 'object';
- }
-
- return ret;
-};
-
-/**
- Returns YES if the passed value is null or undefined. This avoids errors
- from JSLint complaining about use of ==, which can be technically
- confusing.
-
- @param {Object} obj Value to test
- @returns {Boolean}
-*/
-Ember.none = function(obj) {
- return obj === null || obj === undefined;
-};
-
-/**
- Verifies that a value is null or an empty string | array | function.
-
- @param {Object} obj Value to test
- @returns {Boolean}
-*/
-Ember.empty = function(obj) {
- return obj === null || obj === undefined || (obj.length === 0 && typeof obj !== 'function');
-};
-
-/**
- Ember.isArray defined in ember-metal/lib/utils
-**/
-
-/**
- This will compare two javascript values of possibly different types.
- It will tell you which one is greater than the other by returning:
-
- - -1 if the first is smaller than the second,
- - 0 if both are equal,
- - 1 if the first is greater than the second.
-
- The order is calculated based on Ember.ORDER_DEFINITION, if types are different.
- In case they have the same type an appropriate comparison for this type is made.
-
- @param {Object} v First value to compare
- @param {Object} w Second value to compare
- @returns {Number} -1 if v < w, 0 if v = w and 1 if v > w.
-*/
-Ember.compare = function (v, w) {
- if (v === w) { return 0; }
-
- var type1 = Ember.typeOf(v);
- var type2 = Ember.typeOf(w);
-
- var Comparable = Ember.Comparable;
- if (Comparable) {
- if (type1==='instance' && Comparable.detect(v.constructor)) {
- return v.constructor.compare(v, w);
- }
-
- if (type2 === 'instance' && Comparable.detect(w.constructor)) {
- return 1-w.constructor.compare(w, v);
- }
- }
-
- // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
- // do so now.
- var mapping = Ember.ORDER_DEFINITION_MAPPING;
- if (!mapping) {
- var order = Ember.ORDER_DEFINITION;
- mapping = Ember.ORDER_DEFINITION_MAPPING = {};
- var idx, len;
- for (idx = 0, len = order.length; idx < len; ++idx) {
- mapping[order[idx]] = idx;
- }
-
- // We no longer need Ember.ORDER_DEFINITION.
- delete Ember.ORDER_DEFINITION;
- }
-
- var type1Index = mapping[type1];
- var type2Index = mapping[type2];
-
- if (type1Index < type2Index) { return -1; }
- if (type1Index > type2Index) { return 1; }
-
- // types are equal - so we have to check values now
- switch (type1) {
- case 'boolean':
- case 'number':
- if (v < w) { return -1; }
- if (v > w) { return 1; }
- return 0;
-
- case 'string':
- var comp = v.localeCompare(w);
- if (comp < 0) { return -1; }
- if (comp > 0) { return 1; }
- return 0;
-
- case 'array':
- var vLen = v.length;
- var wLen = w.length;
- var l = Math.min(vLen, wLen);
- var r = 0;
- var i = 0;
- var thisFunc = arguments.callee;
- while (r === 0 && i < l) {
- r = thisFunc(v[i],w[i]);
- i++;
- }
- if (r !== 0) { return r; }
-
- // all elements are equal now
- // shorter array should be ordered first
- if (vLen < wLen) { return -1; }
- if (vLen > wLen) { return 1; }
- // arrays are equal now
- return 0;
-
- case 'instance':
- if (Ember.Comparable && Ember.Comparable.detect(v)) {
- return v.compare(v, w);
- }
- return 0;
-
- default:
- return 0;
- }
-};
-
-function _copy(obj, deep, seen, copies) {
- var ret, loc, key;
-
- // primitive data types are immutable, just return them.
- if ('object' !== typeof obj || obj===null) return obj;
-
- // avoid cyclical loops
- if (deep && (loc=seen.indexOf(obj))>=0) return copies[loc];
-
- ember_assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof Ember.Object) || (Ember.Copyable && Ember.Copyable.detect(obj)));
-
- // IMPORTANT: this specific test will detect a native array only. Any other
- // object will need to implement Copyable.
- if (Ember.typeOf(obj) === 'array') {
- ret = obj.slice();
- if (deep) {
- loc = ret.length;
- while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
- }
- } else if (Ember.Copyable && Ember.Copyable.detect(obj)) {
- ret = obj.copy(deep, seen, copies);
- } else {
- ret = {};
- for(key in obj) {
- if (!obj.hasOwnProperty(key)) continue;
- ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
- }
- }
-
- if (deep) {
- seen.push(obj);
- copies.push(ret);
- }
-
- return ret;
-}
-
-/**
- Creates a clone of the passed object. This function can take just about
- any type of object and create a clone of it, including primitive values
- (which are not actually cloned because they are immutable).
-
- If the passed object implements the clone() method, then this function
- will simply call that method and return the result.
-
- @param {Object} object The object to clone
- @param {Boolean} deep If true, a deep copy of the object is made
- @returns {Object} The cloned object
-*/
-Ember.copy = function(obj, deep) {
- // fast paths
- if ('object' !== typeof obj || obj===null) return obj; // can't copy primitives
- if (Ember.Copyable && Ember.Copyable.detect(obj)) return obj.copy(deep);
- return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
-};
-
-/**
- Convenience method to inspect an object. This method will attempt to
- convert the object into a useful string description.
-
- @param {Object} obj The object you want to inspect.
- @returns {String} A description of the object
-*/
-Ember.inspect = function(obj) {
- var v, ret = [];
- for(var key in obj) {
- if (obj.hasOwnProperty(key)) {
- v = obj[key];
- if (v === 'toString') { continue; } // ignore useless items
- if (Ember.typeOf(v) === 'function') { v = "function() { ... }"; }
- ret.push(key + ": " + v);
- }
- }
- return "{" + ret.join(" , ") + "}";
-};
-
-/**
- Compares two objects, returning true if they are logically equal. This is
- a deeper comparison than a simple triple equal. For arrays and enumerables
- it will compare the internal objects. For any other object that implements
- `isEqual()` it will respect that method.
-
- @param {Object} a first object to compare
- @param {Object} b second object to compare
- @returns {Boolean}
-*/
-Ember.isEqual = function(a, b) {
- if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
- return a === b;
-};
-
-/**
- @private
- Used by Ember.compare
-*/
-Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
- 'undefined',
- 'null',
- 'boolean',
- 'number',
- 'string',
- 'array',
- 'object',
- 'instance',
- 'function',
- 'class'
-];
-
-/**
- Returns all of the keys defined on an object or hash. This is useful
- when inspecting objects for debugging. On browsers that support it, this
- uses the native Object.keys implementation.
-
- @function
- @param {Object} obj
- @returns {Array} Array containing keys of obj
-*/
-Ember.keys = Object.keys;
-
-if (!Ember.keys) {
- Ember.keys = function(obj) {
- var ret = [];
- for(var key in obj) {
- if (obj.hasOwnProperty(key)) { ret.push(key); }
- }
- return ret;
- };
-}
-
-// ..........................................................
-// ERROR
-//
-
-/**
- @class
-
- A subclass of the JavaScript Error object for use in Ember.
-*/
-Ember.Error = function() {
- var tmp = Error.prototype.constructor.apply(this, arguments);
-
- for (var p in tmp) {
- if (tmp.hasOwnProperty(p)) { this[p] = tmp[p]; }
- }
- this.message = tmp.message;
-};
-
-Ember.Error.prototype = Ember.create(Error.prototype);
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-
-
-
-
-
-/** @private **/
-var STRING_DASHERIZE_REGEXP = (/[ _]/g);
-var STRING_DASHERIZE_CACHE = {};
-var STRING_DECAMELIZE_REGEXP = (/([a-z])([A-Z])/g);
-var STRING_CAMELIZE_REGEXP = (/(\-|_|\s)+(.)?/g);
-var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
-var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
-
-/**
- Defines the hash of localized strings for the current language. Used by
- the `Ember.String.loc()` helper. To localize, add string values to this
- hash.
-
- @property {String}
-*/
-Ember.STRINGS = {};
-
-/**
- Defines string helper methods including string formatting and localization.
- Unless Ember.EXTEND_PROTOTYPES = false these methods will also be added to the
- String.prototype as well.
-
- @namespace
-*/
-Ember.String = {
-
- /**
- Apply formatting options to the string. This will look for occurrences
- of %@ in your string and substitute them with the arguments you pass into
- this method. If you want to control the specific order of replacement,
- you can add a number after the key as well to indicate which argument
- you want to insert.
-
- Ordered insertions are most useful when building loc strings where values
- you need to insert may appear in different orders.
-
- ## Examples
-
- "Hello %@ %@".fmt('John', 'Doe') => "Hello John Doe"
- "Hello %@2, %@1".fmt('John', 'Doe') => "Hello Doe, John"
-
- @param {Object...} [args]
- @returns {String} formatted string
- */
- fmt: function(str, formats) {
- // first, replace any ORDERED replacements.
- var idx = 0; // the current index for non-numerical replacements
- return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
- argIndex = (argIndex) ? parseInt(argIndex,0) - 1 : idx++ ;
- s = formats[argIndex];
- return ((s === null) ? '(null)' : (s === undefined) ? '' : s).toString();
- }) ;
+ return obj instanceof this;
},
/**
- Formats the passed string, but first looks up the string in the localized
- strings hash. This is a convenient way to localize text. See
- `Ember.String.fmt()` for more information on formatting.
+ In some cases, you may want to annotate computed properties with additional
+ metadata about how they function or what values they operate on. For example,
+ computed property functions may close over variables that are then no longer
+ available for introspection.
- Note that it is traditional but not required to prefix localized string
- keys with an underscore or other character so you can easily identify
- localized strings.
+ You can pass a hash of these values to a computed property like this:
- # Example Usage
+ person: function() {
+ var personId = this.get('personId');
+ return App.Person.create({ id: personId });
+ }.property().meta({ type: App.Person })
- @javascript@
- Ember.STRINGS = {
- '_Hello World': 'Bonjour le monde',
- '_Hello %@ %@': 'Bonjour %@ %@'
- };
+ Once you've done this, you can retrieve the values saved to the computed
+ property from your class like this:
- Ember.String.loc("_Hello World");
- => 'Bonjour le monde';
+ MyClass.metaForProperty('person');
- Ember.String.loc("_Hello %@ %@", ["John", "Smith"]);
- => "Bonjour John Smith";
-
-
-
- @param {String} str
- The string to format
-
- @param {Array} formats
- Optional array of parameters to interpolate into string.
-
- @returns {String} formatted string
+ This will return the original hash that was passed to `meta()`.
*/
- loc: function(str, formats) {
- str = Ember.STRINGS[str] || str;
- return Ember.String.fmt(str, formats) ;
- },
+ metaForProperty: function(key) {
+ var desc = meta(this.proto(), false).descs[key];
- /**
- Splits a string into separate units separated by spaces, eliminating any
- empty strings in the process. This is a convenience method for split that
- is mostly useful when applied to the String.prototype.
-
- # Example Usage
-
- @javascript@
- Ember.String.w("alpha beta gamma").forEach(function(key) {
- console.log(key);
- });
- > alpha
- > beta
- > gamma
-
- @param {String} str
- The string to split
-
- @returns {String} split string
- */
- w: function(str) { return str.split(/\s+/); },
-
- /**
- Converts a camelized string into all lower case separated by underscores.
-
- h2. Examples
-
- | *Input String* | *Output String* |
- | my favorite items | my favorite items |
- | css-class-name | css-class-name |
- | action_name | action_name |
- | innerHTML | inner_html |
-
- @returns {String} the decamelized string.
- */
- decamelize: function(str) {
- return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+ ember_assert("metaForProperty() could not find a computed property with key '"+key+"'.", !!desc && desc instanceof Ember.ComputedProperty);
+ return desc._meta || {};
},
/**
- Converts a camelized string or a string with spaces or underscores into
- a string with components separated by dashes.
-
- h2. Examples
-
- | *Input String* | *Output String* |
- | my favorite items | my-favorite-items |
- | css-class-name | css-class-name |
- | action_name | action-name |
- | innerHTML | inner-html |
-
- @returns {String} the dasherized string.
+ Iterate over each computed property for the class, passing its name
+ and any associated metadata (see `metaForProperty`) to the callback.
*/
- dasherize: function(str) {
- var cache = STRING_DASHERIZE_CACHE,
- ret = cache[str];
+ eachComputedProperty: function(callback, binding) {
+ var proto = this.proto(),
+ descs = meta(proto).descs,
+ empty = {},
+ property;
- if (ret) {
- return ret;
- } else {
- ret = Ember.String.decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
- cache[str] = ret;
- }
+ for (var name in descs) {
+ property = descs[name];
- return ret;
- },
-
- /**
- Converts a dasherized string or a string with spaces or underscores into
- camelized string.
-
- h2. Examples
-
- | *Input String* | *Output String* |
- | my favorite items | myFavoriteItems |
- | css-class-name | cssClassName |
- | action_name | actionName |
- | innerHTML | innerHTML |
-
- @returns {String} the camelized string.
- */
- camelize: function(str) {
- return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
- return chr ? chr.toUpperCase() : '';
- });
- },
-
- /**
- More general than decamelize, converts a dasherized or camelcased string or a string with spaces into
- all lower case separated by undescores.
-
- h2. Examples
-
- | *Input String* | *Output String* |
- | my favorite items | my_favorite_items |
- | css-class-name | css_class_name |
- | action_name | action_name |
- | innerHTML | inner_html |
-
- @returns {String} the camelized string.
- */
- underscore: function(str) {
- return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
- replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
- }
-};
-
-
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-// Portions ©2008-2010 Apple Inc. All rights reserved.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var get = Ember.get, set = Ember.set;
-
-/**
- @namespace
-
- Implements some standard methods for copying an object. Add this mixin to
- any object you create that can create a copy of itself. This mixin is
- added automatically to the built-in array.
-
- You should generally implement the copy() method to return a copy of the
- receiver.
-
- Note that frozenCopy() will only work if you also implement Ember.Freezable.
-
- @since Ember 0.9
-*/
-Ember.Copyable = Ember.Mixin.create(
-/** @scope Ember.Copyable.prototype */ {
-
- /**
- Override to return a copy of the receiver. Default implementation raises
- an exception.
-
- @param deep {Boolean} if true, a deep copy of the object should be made
- @returns {Object} copy of receiver
- */
- copy: Ember.required(Function),
-
- /**
- If the object implements Ember.Freezable, then this will return a new copy
- if the object is not frozen and the receiver if the object is frozen.
-
- Raises an exception if you try to call this method on a object that does
- not support freezing.
-
- You should use this method whenever you want a copy of a freezable object
- since a freezable object can simply return itself without actually
- consuming more memory.
-
- @returns {Object} copy of receiver or receiver
- */
- frozenCopy: function() {
- if (Ember.Freezable && Ember.Freezable.detect(this)) {
- return get(this, 'isFrozen') ? this : this.copy().freeze();
- } else {
- throw new Error(Ember.String.fmt("%@ does not support freezing", [this]));
+ if (property instanceof Ember.ComputedProperty) {
+ callback.call(binding || this, name, property._meta || empty);
+ }
}
}
+
});
+CoreObject.ClassMixin = ClassMixin;
+ClassMixin.apply(CoreObject);
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-// Portions ©2008-2010 Apple Inc. All rights reserved.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-
-
-
-
-
-var get = Ember.get, set = Ember.set;
-
/**
- @namespace
-
- The Ember.Freezable mixin implements some basic methods for marking an object
- as frozen. Once an object is frozen it should be read only. No changes
- may be made the internal state of the object.
-
- ## Enforcement
-
- To fully support freezing in your subclass, you must include this mixin and
- override any method that might alter any property on the object to instead
- raise an exception. You can check the state of an object by checking the
- isFrozen property.
-
- Although future versions of JavaScript may support language-level freezing
- object objects, that is not the case today. Even if an object is freezable,
- it is still technically possible to modify the object, even though it could
- break other parts of your application that do not expect a frozen object to
- change. It is, therefore, very important that you always respect the
- isFrozen property on all freezable objects.
-
- ## Example Usage
-
- The example below shows a simple object that implement the Ember.Freezable
- protocol.
-
- Contact = Ember.Object.extend(Ember.Freezable, {
-
- firstName: null,
-
- lastName: null,
-
- // swaps the names
- swapNames: function() {
- if (this.get('isFrozen')) throw Ember.FROZEN_ERROR;
- var tmp = this.get('firstName');
- this.set('firstName', this.get('lastName'));
- this.set('lastName', tmp);
- return this;
- }
-
- });
-
- c = Context.create({ firstName: "John", lastName: "Doe" });
- c.swapNames(); => returns c
- c.freeze();
- c.swapNames(); => EXCEPTION
-
- ## Copying
-
- Usually the Ember.Freezable protocol is implemented in cooperation with the
- Ember.Copyable protocol, which defines a frozenCopy() method that will return
- a frozen object, if the object implements this method as well.
-
- @since Ember 0.9
+ @class
*/
-Ember.Freezable = Ember.Mixin.create(
-/** @scope Ember.Freezable.prototype */ {
+Ember.CoreObject = CoreObject;
- /**
- Set to YES when the object is frozen. Use this property to detect whether
- your object is frozen or not.
- @property {Boolean}
- */
- isFrozen: false,
- /**
- Freezes the object. Once this method has been called the object should
- no longer allow any properties to be edited.
- @returns {Object} reciever
- */
- freeze: function() {
- if (get(this, 'isFrozen')) return this;
- set(this, 'isFrozen', true);
- return this;
- }
+})();
-});
-Ember.FROZEN_ERROR = "Frozen object cannot be modified.";
-
-
-
-})({});
-
-
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -9083,23 +10398,23 @@
An unordered collection of objects.
A Set works a bit like an array except that its items are not ordered.
You can create a set to efficiently test for membership for an object. You
can also iterate through a set just like an array, even accessing objects
- by index, however there is no gaurantee as to their order.
+ by index, however there is no guarantee as to their order.
Starting with Ember 2.0 all Sets are now observable since there is no
added cost to providing this support. Sets also do away with the more
- specialized Set Observer API in favor of the more generic Enumerable
+ specialized Set Observer API in favor of the more generic Enumerable
Observer API - which works on any enumerable object including both Sets and
Arrays.
## Creating a Set
- You can create a set like you would most objects using
- `new Ember.Set()`. Most new sets you create will be empty, but you can
- also initialize the set with some content by passing an array or other
+ You can create a set like you would most objects using
+ `new Ember.Set()`. Most new sets you create will be empty, but you can
+ also initialize the set with some content by passing an array or other
enumerable of objects to the constructor.
Finally, you can pass in an existing set and the set will be copied. You
can also create a copy of a set by calling `Ember.Set#copy()`.
@@ -9116,60 +10431,60 @@
// same as above.
var anotherNamesCopy = names.copy();
## Adding/Removing Objects
- You generally add or remove objects from a set using `add()` or
- `remove()`. You can add any type of object including primitives such as
+ You generally add or remove objects from a set using `add()` or
+ `remove()`. You can add any type of object including primitives such as
numbers, strings, and booleans.
- Unlike arrays, objects can only exist one time in a set. If you call `add()`
+ Unlike arrays, objects can only exist one time in a set. If you call `add()`
on a set with the same object multiple times, the object will only be added
once. Likewise, calling `remove()` with the same object multiple times will
remove the object the first time and have no effect on future calls until
you add the object to the set again.
- NOTE: You cannot add/remove null or undefined to a set. Any attempt to do so
+ NOTE: You cannot add/remove null or undefined to a set. Any attempt to do so
will be ignored.
- In addition to add/remove you can also call `push()`/`pop()`. Push behaves
- just like `add()` but `pop()`, unlike `remove()` will pick an arbitrary
- object, remove it and return it. This is a good way to use a set as a job
+ In addition to add/remove you can also call `push()`/`pop()`. Push behaves
+ just like `add()` but `pop()`, unlike `remove()` will pick an arbitrary
+ object, remove it and return it. This is a good way to use a set as a job
queue when you don't care which order the jobs are executed in.
## Testing for an Object
- To test for an object's presence in a set you simply call
+ To test for an object's presence in a set you simply call
`Ember.Set#contains()`.
## Observing changes
- When using `Ember.Set`, you can observe the `"[]"` property to be
- alerted whenever the content changes. You can also add an enumerable
+ When using `Ember.Set`, you can observe the `"[]"` property to be
+ alerted whenever the content changes. You can also add an enumerable
observer to the set to be notified of specific objects that are added and
- removed from the set. See `Ember.Enumerable` for more information on
+ removed from the set. See `Ember.Enumerable` for more information on
enumerables.
This is often unhelpful. If you are filtering sets of objects, for instance,
- it is very inefficient to re-filter all of the items each time the set
- changes. It would be better if you could just adjust the filtered set based
- on what was changed on the original set. The same issue applies to merging
+ it is very inefficient to re-filter all of the items each time the set
+ changes. It would be better if you could just adjust the filtered set based
+ on what was changed on the original set. The same issue applies to merging
sets, as well.
## Other Methods
`Ember.Set` primary implements other mixin APIs. For a complete reference
on the methods you will use with `Ember.Set`, please consult these mixins.
- The most useful ones will be `Ember.Enumerable` and
- `Ember.MutableEnumerable` which implement most of the common iterator
+ The most useful ones will be `Ember.Enumerable` and
+ `Ember.MutableEnumerable` which implement most of the common iterator
methods you are used to on Array.
Note that you can also use the `Ember.Copyable` and `Ember.Freezable`
- APIs on `Ember.Set` as well. Once a set is frozen it can no longer be
+ APIs on `Ember.Set` as well. Once a set is frozen it can no longer be
modified. The benefit of this is that when you call frozenCopy() on it,
Ember will avoid making copies of the set. This allows you to write
- code that can know with certainty when the underlying set data will or
+ code that can know with certainty when the underlying set data will or
will not be modified.
@extends Ember.Enumerable
@extends Ember.MutableEnumerable
@extends Ember.Copyable
@@ -9191,109 +10506,186 @@
@default 0
*/
length: 0,
/**
- Clears the set. This is useful if you want to reuse an existing set
+ Clears the set. This is useful if you want to reuse an existing set
without having to recreate it.
- @returns {Ember.Set}
+ var colors = new Ember.Set(["red", "green", "blue"]);
+ colors.length; => 3
+ colors.clear();
+ colors.length; => 0
+
+ @returns {Ember.Set} An empty Set
*/
clear: function() {
if (this.isFrozen) { throw new Error(Ember.FROZEN_ERROR); }
var len = get(this, 'length');
+ var guid;
this.enumerableContentWillChange(len, 0);
+ for (var i=0; i < len; i++){
+ guid = guidFor(this[i]);
+ delete this[guid];
+ delete this[i];
+ }
set(this, 'length', 0);
this.enumerableContentDidChange(len, 0);
return this;
},
/**
- Returns true if the passed object is also an enumerable that contains the
+ Returns true if the passed object is also an enumerable that contains the
same objects as the receiver.
- @param {Ember.Set} obj the other object
+ var colors = ["red", "green", "blue"],
+ same_colors = new Ember.Set(colors);
+ same_colors.isEqual(colors); => true
+ same_colors.isEqual(["purple", "brown"]); => false
+
+ @param {Ember.Set} obj the other object.
@returns {Boolean}
*/
isEqual: function(obj) {
// fail fast
if (!Ember.Enumerable.detect(obj)) return false;
-
+
var loc = get(this, 'length');
if (get(obj, 'length') !== loc) return false;
while(--loc >= 0) {
if (!obj.contains(this[loc])) return false;
}
return true;
},
-
+
/**
- Adds an object to the set. Only non-null objects can be added to a set
+ Adds an object to the set. Only non-null objects can be added to a set
and those can only be added once. If the object is already in the set or
the passed value is null this method will have no effect.
This is an alias for `Ember.MutableEnumerable.addObject()`.
+ var colors = new Ember.Set();
+ colors.add("blue"); => ["blue"]
+ colors.add("blue"); => ["blue"]
+ colors.add("red"); => ["blue", "red"]
+ colors.add(null); => ["blue", "red"]
+ colors.add(undefined); => ["blue", "red"]
+
@function
- @param {Object} obj The object to add
- @returns {Ember.Set} receiver
+ @param {Object} obj The object to add.
+ @returns {Ember.Set} The set itself.
*/
add: Ember.alias('addObject'),
/**
Removes the object from the set if it is found. If you pass a null value
or an object that is already not in the set, this method will have no
effect. This is an alias for `Ember.MutableEnumerable.removeObject()`.
+ var colors = new Ember.Set(["red", "green", "blue"]);
+ colors.remove("red"); => ["blue", "green"]
+ colors.remove("purple"); => ["blue", "green"]
+ colors.remove(null); => ["blue", "green"]
+
@function
@param {Object} obj The object to remove
- @returns {Ember.Set} receiver
+ @returns {Ember.Set} The set itself.
*/
remove: Ember.alias('removeObject'),
-
+
/**
- Removes an arbitrary object from the set and returns it.
+ Removes the last element from the set and returns it, or null if it's empty.
+
+ var colors = new Ember.Set(["green", "blue"]);
+ colors.pop(); => "blue"
+ colors.pop(); => "green"
+ colors.pop(); => null
- @returns {Object} An object from the set or null
+ @returns {Object} The removed object from the set or null.
*/
pop: function() {
if (get(this, 'isFrozen')) throw new Error(Ember.FROZEN_ERROR);
var obj = this.length > 0 ? this[this.length-1] : null;
this.remove(obj);
return obj;
},
/**
+ Inserts the given object on to the end of the set. It returns
+ the set itself.
+
This is an alias for `Ember.MutableEnumerable.addObject()`.
+ var colors = new Ember.Set();
+ colors.push("red"); => ["red"]
+ colors.push("green"); => ["red", "green"]
+ colors.push("blue"); => ["red", "green", "blue"]
+
@function
+ @returns {Ember.Set} The set itself.
*/
push: Ember.alias('addObject'),
-
+
/**
+ Removes the last element from the set and returns it, or null if it's empty.
+
This is an alias for `Ember.Set.pop()`.
+
+ var colors = new Ember.Set(["green", "blue"]);
+ colors.shift(); => "blue"
+ colors.shift(); => "green"
+ colors.shift(); => null
+
@function
+ @returns {Object} The removed object from the set or null.
*/
shift: Ember.alias('pop'),
/**
+ Inserts the given object on to the end of the set. It returns
+ the set itself.
+
This is an alias of `Ember.Set.push()`
+
+ var colors = new Ember.Set();
+ colors.unshift("red"); => ["red"]
+ colors.unshift("green"); => ["red", "green"]
+ colors.unshift("blue"); => ["red", "green", "blue"]
+
@function
+ @returns {Ember.Set} The set itself.
*/
unshift: Ember.alias('push'),
/**
+ Adds each object in the passed enumerable to the set.
+
This is an alias of `Ember.MutableEnumerable.addObjects()`
+
+ var colors = new Ember.Set();
+ colors.addEach(["red", "green", "blue"]); => ["red", "green", "blue"]
+
@function
+ @param {Ember.Enumerable} objects the objects to add.
+ @returns {Ember.Set} The set itself.
*/
addEach: Ember.alias('addObjects'),
/**
+ Removes each object in the passed enumerable to the set.
+
This is an alias of `Ember.MutableEnumerable.removeObjects()`
+
+ var colors = new Ember.Set(["red", "green", "blue"]);
+ colors.removeEach(["red", "blue"]); => ["green"]
+
@function
+ @param {Ember.Enumerable} objects the objects to remove.
+ @returns {Ember.Set} The set itself.
*/
removeEach: Ember.alias('removeObjects'),
// ..........................................................
// PRIVATE ENUMERABLE SUPPORT
@@ -9310,11 +10702,11 @@
return this[idx];
},
/** @private - more optimized version */
firstObject: Ember.computed(function() {
- return this.length > 0 ? this[0] : undefined;
+ return this.length > 0 ? this[0] : undefined;
}).property('[]').cacheable(),
/** @private - more optimized version */
lastObject: Ember.computed(function() {
return this.length > 0 ? this[this.length-1] : undefined;
@@ -9322,45 +10714,45 @@
/** @private (nodoc) - implements Ember.MutableEnumerable */
addObject: function(obj) {
if (get(this, 'isFrozen')) throw new Error(Ember.FROZEN_ERROR);
if (none(obj)) return this; // nothing to do
-
+
var guid = guidFor(obj),
idx = this[guid],
len = get(this, 'length'),
added ;
-
+
if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
-
+
added = [obj];
this.enumerableContentWillChange(null, added);
len = get(this, 'length');
this[guid] = len;
this[len] = obj;
set(this, 'length', len+1);
this.enumerableContentDidChange(null, added);
return this;
},
-
+
/** @private (nodoc) - implements Ember.MutableEnumerable */
removeObject: function(obj) {
if (get(this, 'isFrozen')) throw new Error(Ember.FROZEN_ERROR);
if (none(obj)) return this; // nothing to do
-
+
var guid = guidFor(obj),
idx = this[guid],
len = get(this, 'length'),
last, removed;
-
-
+
+
if (idx>=0 && idx<len && (this[idx] === obj)) {
removed = [obj];
this.enumerableContentWillChange(removed, null);
-
+
// swap items - basically move the item to the end so it can be removed
if (idx < len-1) {
last = this[len-1];
this[idx] = last;
this[guidFor(last)] = idx;
@@ -9370,42 +10762,42 @@
delete this[len-1];
set(this, 'length', len-1);
this.enumerableContentDidChange(removed, null);
}
-
+
return this;
},
/** @private (nodoc) - optimized version */
contains: function(obj) {
return this[guidFor(obj)]>=0;
},
-
+
/** @private (nodoc) */
copy: function() {
var C = this.constructor, ret = new C(), loc = get(this, 'length');
set(ret, 'length', loc);
while(--loc>=0) {
ret[loc] = this[loc];
ret[guidFor(this[loc])] = loc;
}
return ret;
},
-
+
/** @private */
toString: function() {
var len = this.length, idx, array = [];
for(idx = 0; idx < len; idx++) {
array[idx] = this[idx];
}
return "Ember.Set<%@>".fmt(array.join(','));
},
-
+
// ..........................................................
// DEPRECATED
- //
+ //
/** @deprecated
This property is often used to determine that a given object is a set.
Instead you should use instanceof:
@@ -9419,30 +10811,29 @@
@type Boolean
@default true
*/
isSet: true
-
+
});
-// Support the older API
+// Support the older API
var o_create = Ember.Set.create;
Ember.Set.create = function(items) {
if (items && Ember.Enumerable.detect(items)) {
- Ember.Logger.warn('Passing an enumerable to Ember.Set.create() is deprecated and will be removed in a future version of Ember. Use new Ember.Set(items) instead');
+ ember_deprecate('Passing an enumerable to Ember.Set.create() is deprecated and will be removed in a future version of Ember. Use new Ember.Set(items) instead.');
return new Ember.Set(items);
} else {
return o_create.apply(this, arguments);
}
};
+})();
-})({});
-
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -9456,564 +10847,262 @@
Ember.Object = Ember.CoreObject.extend(Ember.Observable);
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
+var indexOf = Ember.ArrayUtils.indexOf;
+
+/**
+ @private
+ A Namespace is an object usually used to contain other objects or methods
+ such as an application or framework. Create a namespace anytime you want
+ to define one of these new containers.
+
+ # Example Usage
+
+ MyFramework = Ember.Namespace.create({
+ VERSION: '1.0.0'
+ });
+
+*/
+Ember.Namespace = Ember.Object.extend({
+ isNamespace: true,
+
+ init: function() {
+ Ember.Namespace.NAMESPACES.push(this);
+ Ember.Namespace.PROCESSED = false;
+ },
+
+ toString: function() {
+ Ember.identifyNamespaces();
+ return this[Ember.GUID_KEY+'_name'];
+ },
+
+ destroy: function() {
+ var namespaces = Ember.Namespace.NAMESPACES;
+ window[this.toString()] = undefined;
+ namespaces.splice(indexOf(namespaces, this), 1);
+ this._super();
+ }
+});
+
+Ember.Namespace.NAMESPACES = [Ember];
+Ember.Namespace.PROCESSED = false;
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+/**
+ @private
+
+ Defines a namespace that will contain an executable application. This is
+ very similar to a normal namespace except that it is expected to include at
+ least a 'ready' function which can be run to initialize the application.
+
+ Currently Ember.Application is very similar to Ember.Namespace. However, this
+ class may be augmented by additional frameworks so it is important to use
+ this instance when building new applications.
+
+ # Example Usage
+
+ MyApp = Ember.Application.create({
+ VERSION: '1.0.0',
+ store: Ember.Store.create().from(Ember.fixtures)
+ });
+
+ MyApp.ready = function() {
+ //..init code goes here...
+ }
+
+*/
+Ember.Application = Ember.Namespace.extend();
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
var get = Ember.get, set = Ember.set;
/**
@class
- An ArrayProxy wraps any other object that implements Ember.Array and/or
- Ember.MutableArray, forwarding all requests. ArrayProxy isn't useful by itself
- but you can extend it to do specialized things like transforming values,
- etc.
+ An ArrayProxy wraps any other object that implements Ember.Array and/or
+ Ember.MutableArray, forwarding all requests. This makes it very useful for
+ a number of binding use cases or other cases where being able to swap
+ out the underlying array is useful.
+ A simple example of usage:
+
+ var pets = ['dog', 'cat', 'fish'];
+ var arrayProxy = Ember.ArrayProxy.create({ content: Ember.A(pets) });
+ ap.get('firstObject'); // => 'dog'
+ ap.set('content', ['amoeba', 'paramecium']);
+ ap.get('firstObject'); // => 'amoeba'
+
+ This class can also be useful as a layer to transform the contents of
+ an array, as they are accessed. This can be done by overriding
+ `objectAtContent`:
+
+ var pets = ['dog', 'cat', 'fish'];
+ var ap = Ember.ArrayProxy.create({
+ content: Ember.A(pets),
+ objectAtContent: function(idx) {
+ return this.get('content').objectAt(idx).toUpperCase();
+ }
+ });
+ ap.get('firstObject'); // => 'DOG'
+
+
@extends Ember.Object
@extends Ember.Array
@extends Ember.MutableArray
*/
Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,
/** @scope Ember.ArrayProxy.prototype */ {
-
+
/**
- The content array. Must be an object that implements Ember.Array and or
+ The content array. Must be an object that implements Ember.Array and/or
Ember.MutableArray.
-
+
@property {Ember.Array}
*/
content: null,
/**
- Should actually retrieve the object at the specified index from the
- content. You can override this method in subclasses to transform the
+ Should actually retrieve the object at the specified index from the
+ content. You can override this method in subclasses to transform the
content item to something new.
-
+
This method will only be called if content is non-null.
-
+
@param {Number} idx
- The index to retreive.
-
+ The index to retrieve.
+
@returns {Object} the value or undefined if none found
*/
objectAtContent: function(idx) {
return get(this, 'content').objectAt(idx);
},
-
+
/**
- Should actually replace the specified objects on the content array.
+ Should actually replace the specified objects on the content array.
You can override this method in subclasses to transform the content item
into something new.
-
+
This method will only be called if content is non-null.
-
+
@param {Number} idx
The starting index
-
+
@param {Number} amt
The number of items to remove from the content.
-
+
@param {Array} objects
Optional array of objects to insert or null if no objects.
-
+
@returns {void}
*/
replaceContent: function(idx, amt, objects) {
get(this, 'content').replace(idx, amt, objects);
},
-
+
+ /**
+ Invoked when the content property is about to change. Notifies observers that the
+ entire array content will change.
+ */
contentWillChange: Ember.beforeObserver(function() {
var content = get(this, 'content'),
len = content ? get(content, 'length') : 0;
this.arrayWillChange(content, 0, len, undefined);
if (content) content.removeArrayObserver(this);
}, 'content'),
-
+
/**
Invoked when the content property changes. Notifies observers that the
entire array content has changed.
*/
contentDidChange: Ember.observer(function() {
var content = get(this, 'content'),
len = content ? get(content, 'length') : 0;
if (content) content.addArrayObserver(this);
this.arrayDidChange(content, 0, undefined, len);
}, 'content'),
-
+
/** @private (nodoc) */
objectAt: function(idx) {
return get(this, 'content') && this.objectAtContent(idx);
},
-
+
/** @private (nodoc) */
length: Ember.computed(function() {
var content = get(this, 'content');
return content ? get(content, 'length') : 0;
}).property('content.length').cacheable(),
-
+
/** @private (nodoc) */
replace: function(idx, amt, objects) {
if (get(this, 'content')) this.replaceContent(idx, amt, objects);
return this;
},
-
+
/** @private (nodoc) */
arrayWillChange: function(item, idx, removedCnt, addedCnt) {
this.arrayContentWillChange(idx, removedCnt, addedCnt);
},
-
+
/** @private (nodoc) */
arrayDidChange: function(item, idx, removedCnt, addedCnt) {
this.arrayContentDidChange(idx, removedCnt, addedCnt);
},
-
+
+ /** @private (nodoc) */
init: function() {
this._super();
this.contentDidChange();
}
-
-});
-
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Metal
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/**
- @class
-
- Ember.ArrayController provides a way for you to publish an array of objects for
- Ember.CollectionView or other controllers to work with. To work with an
- ArrayController, set the content property to the array you want the controller
- to manage. Then work directly with the controller object as if it were the
- array itself.
-
- For example, imagine you wanted to display a list of items fetched via an XHR
- request. Create an Ember.ArrayController and set its `content` property:
-
- MyApp.listController = Ember.ArrayController.create();
-
- $.get('people.json', function(data) {
- MyApp.listController.set('content', data);
- });
-
- Then, create a view that binds to your new controller:
-
- {{#collection contentBinding="MyApp.listController"}}
- {{content.firstName}} {{content.lastName}}
- {{/collection}}
-
- The advantage of using an array controller is that you only have to set up
- your view bindings once; to change what's displayed, simply swap out the
- `content` property on the controller.
-
- @extends Ember.ArrayProxy
-*/
-
-Ember.ArrayController = Ember.ArrayProxy.extend();
-
-})({});
-
-
-(function(exports) {
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-// Portions ©2008-2011 Apple Inc. All rights reserved.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var fmt = Ember.String.fmt,
- w = Ember.String.w,
- loc = Ember.String.loc,
- camelize = Ember.String.camelize,
- decamelize = Ember.String.decamelize,
- dasherize = Ember.String.dasherize,
- underscore = Ember.String.underscore;
-
-if (Ember.EXTEND_PROTOTYPES) {
-
- /**
- @see Ember.String.fmt
- */
- String.prototype.fmt = function() {
- return fmt(this, arguments);
- };
-
- /**
- @see Ember.String.w
- */
- String.prototype.w = function() {
- return w(this);
- };
-
- /**
- @see Ember.String.loc
- */
- String.prototype.loc = function() {
- return loc(this, arguments);
- };
-
- /**
- @see Ember.String.camelize
- */
- String.prototype.camelize = function() {
- return camelize(this);
- };
-
- /**
- @see Ember.String.decamelize
- */
- String.prototype.decamelize = function() {
- return decamelize(this);
- };
-
- /**
- @see Ember.String.dasherize
- */
- String.prototype.dasherize = function() {
- return dasherize(this);
- };
-
- /**
- @see Ember.String.underscore
- */
- String.prototype.underscore = function() {
- return underscore(this);
- };
-
-}
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-// Portions ©2008-2011 Apple Inc. All rights reserved.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var a_slice = Array.prototype.slice;
-
-if (Ember.EXTEND_PROTOTYPES) {
-
- Function.prototype.property = function() {
- var ret = Ember.computed(this);
- return ret.property.apply(ret, arguments);
- };
-
- Function.prototype.observes = function() {
- this.__ember_observes__ = a_slice.call(arguments);
- return this;
- };
-
- Function.prototype.observesBefore = function() {
- this.__ember_observesBefore__ = a_slice.call(arguments);
- return this;
- };
-
-}
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-// Portions ©2008-2011 Apple Inc. All rights reserved.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var IS_BINDING = Ember.IS_BINDING = /^.+Binding$/;
-
-Ember._mixinBindings = function(obj, key, value, m) {
- if (IS_BINDING.test(key)) {
- if (!(value instanceof Ember.Binding)) {
- value = new Ember.Binding(key.slice(0,-7), value); // make binding
- } else {
- value.to(key.slice(0, -7));
- }
- value.connect(obj);
-
- // keep a set of bindings in the meta so that when we rewatch we can
- // resync them...
- var bindings = m.bindings;
- if (!bindings) {
- bindings = m.bindings = { __emberproto__: obj };
- } else if (bindings.__emberproto__ !== obj) {
- bindings = m.bindings = Ember.create(m.bindings);
- bindings.__emberproto__ = obj;
- }
-
- bindings[key] = true;
- }
-
- return value;
-};
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-})({});
-
-
-(function(exports) {
-/**
- * @license
- * ==========================================================================
- * Ember
- * Copyright ©2006-2011, Strobe Inc. and contributors.
- * Portions copyright ©2008-2011 Apple Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * For more information about Ember, visit http://www.emberjs.com
- *
- * ==========================================================================
- */
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-// Portions ©2008-2011 Apple Inc. All rights reserved.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/**
- @namespace
-
- Implements some standard methods for comparing objects. Add this mixin to
- any class you create that can compare its instances.
-
- You should implement the compare() method.
-
- @since Ember 0.9
-*/
-Ember.Comparable = Ember.Mixin.create( /** @scope Ember.Comparable.prototype */{
-
- /**
- walk like a duck. Indicates that the object can be compared.
-
- @type Boolean
- @default YES
- @constant
- */
- isComparable: true,
-
- /**
- Override to return the result of the comparison of the two parameters. The
- compare method should return:
-
- - -1 if a < b
- - 0 if a == b
- - 1 if a > b
-
- Default implementation raises an exception.
-
- @param a {Object} the first object to compare
- @param b {Object} the second object to compare
- @returns {Integer} the result of the comparison
- */
- compare: Ember.required(Function)
-
});
-})({});
-(function(exports) {
-var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
+})();
-Ember.TargetActionSupport = Ember.Mixin.create({
- target: null,
- action: null,
- targetObject: Ember.computed(function() {
- var target = get(this, 'target');
- if (Ember.typeOf(target) === "string") {
- // TODO: Remove the false when deprecation is done
- var value = getPath(this, target, false);
- if (value === undefined) { value = getPath(window, target); }
- return value;
- } else {
- return target;
- }
- }).property('target').cacheable(),
-
- triggerAction: function() {
- var action = get(this, 'action'),
- target = get(this, 'targetObject');
-
- if (target && action) {
- var ret;
-
- if (typeof target.send === 'function') {
- ret = target.send(action, this);
- } else {
- if (typeof action === 'string') {
- action = target[action];
- }
- ret = action.call(target, this);
- }
- if (ret !== false) ret = true;
-
- return ret;
- } else {
- return false;
- }
- }
-});
-
-})({});
-
-
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/**
- @private
- A Namespace is an object usually used to contain other objects or methods
- such as an application or framework. Create a namespace anytime you want
- to define one of these new containers.
-
- # Example Usage
-
- MyFramework = Ember.Namespace.create({
- VERSION: '1.0.0'
- });
-
-*/
-Ember.Namespace = Ember.Object.extend({
- isNamespace: true,
-
- init: function() {
- Ember.Namespace.NAMESPACES.push(this);
- Ember.Namespace.PROCESSED = false;
- },
-
- toString: function() {
- Ember.identifyNamespaces();
- return this[Ember.GUID_KEY+'_name'];
- },
-
- destroy: function() {
- var namespaces = Ember.Namespace.NAMESPACES;
- window[this.toString()] = undefined;
- namespaces.splice(namespaces.indexOf(this), 1);
- this._super();
- }
-});
-
-Ember.Namespace.NAMESPACES = [Ember];
-Ember.Namespace.PROCESSED = false;
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-/**
- @private
-
- Defines a namespace that will contain an executable application. This is
- very similar to a normal namespace except that it is expected to include at
- least a 'ready' function which can be run to initialize the application.
-
- Currently Ember.Application is very similar to Ember.Namespace. However, this
- class may be augmented by additional frameworks so it is important to use
- this instance when building new applications.
-
- # Example Usage
-
- MyApp = Ember.Application.create({
- VERSION: '1.0.0',
- store: Ember.Store.create().from(Ember.fixtures)
- });
-
- MyApp.ready = function() {
- //..init code goes here...
- }
-
-*/
-Ember.Application = Ember.Namespace.extend();
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Runtime
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
var set = Ember.set, get = Ember.get, guidFor = Ember.guidFor;
+var forEach = Ember.ArrayUtils.forEach;
var EachArray = Ember.Object.extend(Ember.Array, {
init: function(content, keyName, owner) {
this._super();
@@ -10034,10 +11123,11 @@
});
var IS_OBSERVER = /^.+:(before|change)$/;
+/** @private */
function addObserverForContentKey(content, keyName, proxy, idx, loc) {
var objects = proxy._objects, guid;
if (!objects) objects = proxy._objects = {};
while(--loc>=idx) {
@@ -10053,10 +11143,11 @@
objects[guid].push(loc);
}
}
}
+/** @private */
function removeObserverForContentKey(content, keyName, proxy, idx, loc) {
var objects = proxy._objects;
if (!objects) objects = proxy._objects = {};
var indicies, guid;
@@ -10090,11 +11181,11 @@
this._content = content;
content.addArrayObserver(this);
// in case someone is already observing some keys make sure they are
// added
- Ember.watchedEvents(this).forEach(function(eventName) {
+ forEach(Ember.watchedEvents(this), function(eventName) {
this.didAddListener(eventName);
}, this);
},
/**
@@ -10201,49 +11292,50 @@
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
var get = Ember.get, set = Ember.set;
-
-// Add Ember.Array to Array.prototype. Remove methods with native
+
+// Add Ember.Array to Array.prototype. Remove methods with native
// implementations and supply some more optimized versions of generic methods
// because they are so common.
var NativeArray = Ember.Mixin.create(Ember.MutableArray, Ember.Observable, Ember.Copyable, {
- // because length is a built-in property we need to know to just get the
+ // because length is a built-in property we need to know to just get the
// original property.
get: function(key) {
if (key==='length') return this.length;
else if ('number' === typeof key) return this[key];
- else return this._super(key);
+ else return this._super(key);
},
-
+
objectAt: function(idx) {
return this[idx];
},
-
+
// primitive for array support.
replace: function(idx, amt, objects) {
if (this.isFrozen) throw Ember.FROZEN_ERROR ;
// if we replaced exactly the same number of items, then pass only the
// replaced range. Otherwise, pass the full remaining array length
// since everything has shifted
var len = objects ? get(objects, 'length') : 0;
this.arrayContentWillChange(idx, amt, len);
-
+
if (!objects || objects.length === 0) {
this.splice(idx, amt) ;
} else {
var args = [idx, amt].concat(objects) ;
this.splice.apply(this,args) ;
@@ -10288,33 +11380,33 @@
for(idx=startAt;idx>=0;idx--) {
if (this[idx] === object) return idx ;
}
return -1;
},
-
+
copy: function() {
return this.slice();
}
});
// Remove any methods implemented natively so we don't override them
var ignore = ['length'];
-NativeArray.keys().forEach(function(methodName) {
+Ember.ArrayUtils.forEach(NativeArray.keys(), function(methodName) {
if (Array.prototype[methodName]) ignore.push(methodName);
});
if (ignore.length>0) {
NativeArray = NativeArray.without.apply(NativeArray, ignore);
}
/**
The NativeArray mixin contains the properties needed to to make the native
- Array support Ember.MutableArray and all of its dependent APIs. Unless you
+ Array support Ember.MutableArray and all of its dependent APIs. Unless you
have Ember.EXTEND_PROTOTYPES set to false, this will be applied automatically.
- Otherwise you can apply the mixin at anytime by calling
+ Otherwise you can apply the mixin at anytime by calling
`Ember.NativeArray.activate`.
-
+
@namespace
@extends Ember.MutableArray
@extends Ember.Array
@extends Ember.Enumerable
@extends Ember.MutableEnumerable
@@ -10335,67 +11427,372 @@
};
/**
Activates the mixin on the Array.prototype if not already applied. Calling
this method more than once is safe.
-
+
@returns {void}
*/
Ember.NativeArray.activate = function() {
NativeArray.apply(Array.prototype);
- Ember.A = function(arr) { return arr || []; }
+ Ember.A = function(arr) { return arr || []; };
};
if (Ember.EXTEND_PROTOTYPES) Ember.NativeArray.activate();
-})({});
+})();
-(function(exports) {
+
+(function() {
+/**
+ JavaScript (before ES6) does not have a Map implementation. Objects,
+ which are often used as dictionaries, may only have Strings as keys.
+
+ Because Ember has a way to get a unique identifier for every object
+ via `Ember.guidFor`, we can implement a performant Map with arbitrary
+ keys. Because it is commonly used in low-level bookkeeping, Map is
+ implemented as a pure JavaScript object for performance.
+
+ This implementation follows the current iteration of the ES6 proposal
+ for maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
+ with two exceptions. First, because we need our implementation to be
+ pleasant on older browsers, we do not use the `delete` name (using
+ `remove` instead). Second, as we do not have the luxury of in-VM
+ iteration, we implement a forEach method for iteration.
+
+ Map is mocked out to look like an Ember object, so you can do
+ `Ember.Map.create()` for symmetry with other Ember classes.
+*/
+
+/** @private */
+var guidFor = Ember.guidFor;
+var indexOf = Ember.ArrayUtils.indexOf;
+
+// This class is used internally by Ember.js and Ember Data.
+// Please do not use it at this time. We plan to clean it up
+// and add many tests soon.
+var OrderedSet = Ember.OrderedSet = function() {
+ this.clear();
+};
+
+OrderedSet.create = function() {
+ return new OrderedSet();
+};
+
+OrderedSet.prototype = {
+ clear: function() {
+ this.presenceSet = {};
+ this.list = [];
+ },
+
+ add: function(obj) {
+ var guid = guidFor(obj),
+ presenceSet = this.presenceSet,
+ list = this.list;
+
+ if (guid in presenceSet) { return; }
+
+ presenceSet[guid] = true;
+ list.push(obj);
+ },
+
+ remove: function(obj) {
+ var guid = guidFor(obj),
+ presenceSet = this.presenceSet,
+ list = this.list;
+
+ delete presenceSet[guid];
+
+ var index = indexOf(list, obj);
+ if (index > -1) {
+ list.splice(index, 1);
+ }
+ },
+
+ isEmpty: function() {
+ return this.list.length === 0;
+ },
+
+ forEach: function(fn, self) {
+ // allow mutation during iteration
+ var list = this.list.slice();
+
+ for (var i = 0, j = list.length; i < j; i++) {
+ fn.call(self, list[i]);
+ }
+ },
+
+ toArray: function() {
+ return this.list.slice();
+ }
+};
+
+/**
+ A Map stores values indexed by keys. Unlike JavaScript's
+ default Objects, the keys of a Map can be any JavaScript
+ object.
+
+ Internally, a Map has two data structures:
+
+ `keys`: an OrderedSet of all of the existing keys
+ `values`: a JavaScript Object indexed by the
+ Ember.guidFor(key)
+
+ When a key/value pair is added for the first time, we
+ add the key to the `keys` OrderedSet, and create or
+ replace an entry in `values`. When an entry is deleted,
+ we delete its entry in `keys` and `values`.
+*/
+
+/** @private */
+var Map = Ember.Map = function() {
+ this.keys = Ember.OrderedSet.create();
+ this.values = {};
+};
+
+Map.create = function() {
+ return new Map();
+};
+
+Map.prototype = {
+ /**
+ Retrieve the value associated with a given key.
+
+ @param {anything} key
+ @return {anything} the value associated with the key, or undefined
+ */
+ get: function(key) {
+ var values = this.values,
+ guid = guidFor(key);
+
+ return values[guid];
+ },
+
+ /**
+ Adds a value to the map. If a value for the given key has already been
+ provided, the new value will replace the old value.
+
+ @param {anything} key
+ @param {anything} value
+ */
+ set: function(key, value) {
+ var keys = this.keys,
+ values = this.values,
+ guid = guidFor(key);
+
+ keys.add(key);
+ values[guid] = value;
+ },
+
+ /**
+ Removes a value from the map for an associated key.
+
+ @param {anything} key
+ @returns {Boolean} true if an item was removed, false otherwise
+ */
+ remove: function(key) {
+ // don't use ES6 "delete" because it will be annoying
+ // to use in browsers that are not ES6 friendly;
+ var keys = this.keys,
+ values = this.values,
+ guid = guidFor(key),
+ value;
+
+ if (values.hasOwnProperty(guid)) {
+ keys.remove(key);
+ value = values[guid];
+ delete values[guid];
+ return true;
+ } else {
+ return false;
+ }
+ },
+
+ /**
+ Check whether a key is present.
+
+ @param {anything} key
+ @returns {Boolean} true if the item was present, false otherwise
+ */
+ has: function(key) {
+ var values = this.values,
+ guid = guidFor(key);
+
+ return values.hasOwnProperty(guid);
+ },
+
+ /**
+ Iterate over all the keys and values. Calls the function once
+ for each key, passing in the key and value, in that order.
+
+ The keys are guaranteed to be iterated over in insertion order.
+
+ @param {Function} callback
+ @param {anything} self if passed, the `this` value inside the
+ callback. By default, `this` is the map.
+ */
+ forEach: function(callback, self) {
+ var keys = this.keys,
+ values = this.values;
+
+ keys.forEach(function(key) {
+ var guid = guidFor(key);
+ callback.call(self, key, values[guid]);
+ });
+ }
+};
+
+})();
+
+
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+})();
-(function(exports) {
+
+
+(function() {
// ==========================================================================
// Project: Ember Runtime
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+/**
+ @class
-(function(exports) {
+ Ember.ArrayController provides a way for you to publish a collection of objects
+ so that you can easily bind to the collection from a Handlebars #each helper,
+ an Ember.CollectionView, or other controllers.
+
+ The advantage of using an ArrayController is that you only have to set up
+ your view bindings once; to change what's displayed, simply swap out the
+ `content` property on the controller.
+
+ For example, imagine you wanted to display a list of items fetched via an XHR
+ request. Create an Ember.ArrayController and set its `content` property:
+
+ MyApp.listController = Ember.ArrayController.create();
+
+ $.get('people.json', function(data) {
+ MyApp.listController.set('content', data);
+ });
+
+ Then, create a view that binds to your new controller:
+
+ {{#each MyApp.listController}}
+ {{firstName}} {{lastName}}
+ {{/each}}
+
+ Although you are binding to the controller, the behavior of this controller
+ is to pass through any methods or properties to the underlying array. This
+ capability comes from `Ember.ArrayProxy`, which this class inherits from.
+
+ Note: As of this writing, `ArrayController` does not add any functionality
+ to its superclass, `ArrayProxy`. The Ember team plans to add additional
+ controller-specific functionality in the future, e.g. single or multiple
+ selection support. If you are creating something that is conceptually a
+ controller, use this class.
+
+ @extends Ember.ArrayProxy
+*/
+
+Ember.ArrayController = Ember.ArrayProxy.extend();
+
+})();
+
+
+
+(function() {
+
+})();
+
+
+
+(function() {
// ==========================================================================
+// Project: Ember Runtime
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
+})();
+
+(function() {
+// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
+ember_assert("Ember requires jQuery 1.6 or 1.7", window.jQuery && window.jQuery().jquery.match(/^1\.[67](\.\d+)?(pre|rc\d?)?/));
+Ember.$ = window.jQuery;
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
var get = Ember.get, set = Ember.set;
+var forEach = Ember.ArrayUtils.forEach;
+var indexOf = Ember.ArrayUtils.indexOf;
+/** @private */
+var ClassSet = function() {
+ this.seen = {};
+ this.list = [];
+};
+
+ClassSet.prototype = {
+ add: function(string) {
+ if (string in this.seen) { return; }
+ this.seen[string] = true;
+
+ this.list.push(string);
+ },
+
+ toDOM: function() {
+ return this.list.join(" ");
+ }
+};
+
/**
@class
Ember.RenderBuffer gathers information regarding the a view and generates the
final representation. Ember.RenderBuffer will generate HTML which can be pushed
to the DOM.
@extends Ember.Object
*/
Ember.RenderBuffer = function(tagName) {
- return Ember._RenderBuffer.create({ elementTag: tagName });
+ return new Ember._RenderBuffer(tagName);
};
-Ember._RenderBuffer = Ember.Object.extend(
+Ember._RenderBuffer = function(tagName) {
+ this.elementTag = tagName;
+ this.childBuffers = [];
+};
+
+Ember._RenderBuffer.prototype =
/** @scope Ember.RenderBuffer.prototype */ {
/**
Array of class-names which will be applied in the class="" attribute
@@ -10465,51 +11862,43 @@
@type Ember._RenderBuffer
*/
parentBuffer: null,
- /** @private */
- init: function() {
- this._super();
-
- set(this ,'elementClasses', Ember.A());
- set(this, 'elementAttributes', {});
- set(this, 'elementStyle', {});
- set(this, 'childBuffers', []);
- set(this, 'elements', {});
- },
-
/**
Adds a string of HTML to the RenderBuffer.
@param {String} string HTML to push into the buffer
@returns {Ember.RenderBuffer} this
*/
push: function(string) {
- get(this, 'childBuffers').push(String(string));
+ this.childBuffers.push(String(string));
return this;
},
/**
Adds a class to the buffer, which will be rendered to the class attribute.
@param {String} className Class name to add to the buffer
@returns {Ember.RenderBuffer} this
*/
addClass: function(className) {
- get(this, 'elementClasses').addObject(className);
+ // lazily create elementClasses
+ var elementClasses = this.elementClasses = (this.elementClasses || new ClassSet());
+ this.elementClasses.add(className);
+
return this;
},
/**
Sets the elementID to be used for the element.
@param {String} id
@returns {Ember.RenderBuffer} this
*/
id: function(id) {
- set(this, 'elementId', id);
+ this.elementId = id;
return this;
},
// duck type attribute functionality like jQuery so a render buffer
// can be used like a jQuery object in attribute binding scenarios.
@@ -10520,14 +11909,14 @@
@param {String} name The name of the attribute
@param {String} value The value to add to the attribute
@returns {Ember.RenderBuffer|String} this or the current attribute value
*/
attr: function(name, value) {
- var attributes = get(this, 'elementAttributes');
+ var attributes = this.elementAttributes = (this.elementAttributes || {});
if (arguments.length === 1) {
- return attributes[name]
+ return attributes[name];
} else {
attributes[name] = value;
}
return this;
@@ -10538,12 +11927,12 @@
@param {String} name The name of the attribute
@returns {Ember.RenderBuffer} this
*/
removeAttr: function(name) {
- var attributes = get(this, 'elementAttributes');
- delete attributes[name];
+ var attributes = this.elementAttributes;
+ if (attributes) { delete attributes[name]; }
return this;
},
/**
@@ -10552,11 +11941,13 @@
@param {String} name Name of the style
@param {String} value
@returns {Ember.RenderBuffer} this
*/
style: function(name, value) {
- get(this, 'elementStyle')[name] = value;
+ var style = this.elementStyle = (this.elementStyle || {});
+
+ this.elementStyle[name] = value;
return this;
},
/**
Create a new child render buffer from a parent buffer. Optionally set
@@ -10573,14 +11964,12 @@
@param {Function} fn A callback to invoke with the newly created buffer.
@param {Object} other Additional properties to add to the newly created
buffer.
*/
newBuffer: function(tagName, parent, fn, other) {
- var buffer = Ember._RenderBuffer.create({
- parentBuffer: parent,
- elementTag: tagName
- });
+ var buffer = new Ember._RenderBuffer(tagName);
+ buffer.parentBuffer = parent;
if (other) { buffer.setProperties(other); }
if (fn) { fn.call(this, buffer); }
return buffer;
@@ -10594,16 +11983,16 @@
@private
@param {Ember._RenderBuffer} buffer The buffer to insert in place of
the existing buffer.
*/
replaceWithBuffer: function(newBuffer) {
- var parent = get(this, 'parentBuffer');
+ var parent = this.parentBuffer;
if (!parent) { return; }
- var childBuffers = get(parent, 'childBuffers');
+ var childBuffers = parent.childBuffers;
- var index = childBuffers.indexOf(this);
+ var index = indexOf(childBuffers, this);
if (newBuffer) {
childBuffers.splice(index, 1, newBuffer);
} else {
childBuffers.splice(index, 1);
@@ -10618,32 +12007,32 @@
@param {String} tagName Tag name to use for the child buffer's element
@returns {Ember.RenderBuffer} A new RenderBuffer object
*/
begin: function(tagName) {
return this.newBuffer(tagName, this, function(buffer) {
- get(this, 'childBuffers').push(buffer);
+ this.childBuffers.push(buffer);
});
},
/**
Prepend a new child buffer to the current render buffer.
@param {String} tagName Tag name to use for the child buffer's element
*/
prepend: function(tagName) {
return this.newBuffer(tagName, this, function(buffer) {
- get(this, 'childBuffers').splice(0, 0, buffer);
+ this.childBuffers.splice(0, 0, buffer);
});
},
/**
Replace the current buffer with a new render buffer.
@param {String} tagName Tag name to use for the new buffer's element
*/
replaceWith: function(tagName) {
- var parentBuffer = get(this, 'parentBuffer');
+ var parentBuffer = this.parentBuffer;
return this.newBuffer(tagName, parentBuffer, function(buffer) {
this.replaceWithBuffer(buffer);
});
},
@@ -10655,23 +12044,23 @@
*/
insertAfter: function(tagName) {
var parentBuffer = get(this, 'parentBuffer');
return this.newBuffer(tagName, parentBuffer, function(buffer) {
- var siblings = get(parentBuffer, 'childBuffers');
- var index = siblings.indexOf(this);
+ var siblings = parentBuffer.childBuffers;
+ var index = indexOf(siblings, this);
siblings.splice(index + 1, 0, buffer);
});
},
/**
Closes the current buffer and adds its content to the parentBuffer.
@returns {Ember.RenderBuffer} The parentBuffer, if one exists. Otherwise, this
*/
end: function() {
- var parent = get(this, 'parentBuffer');
+ var parent = this.parentBuffer;
return parent || this;
},
remove: function() {
this.replaceWithBuffer(null);
@@ -10689,63 +12078,76 @@
Generates the HTML content for this buffer.
@returns {String} The generated HTMl
*/
string: function() {
- var id = get(this, 'elementId'),
- classes = get(this, 'elementClasses'),
- attrs = get(this, 'elementAttributes'),
- style = get(this, 'elementStyle'),
- tag = get(this, 'elementTag'),
- content = '',
- styleBuffer = [], prop;
+ var content = '', tag = this.elementTag, openTag;
if (tag) {
- var openTag = ["<" + tag];
+ var id = this.elementId,
+ classes = this.elementClasses,
+ attrs = this.elementAttributes,
+ style = this.elementStyle,
+ styleBuffer = '', prop;
- if (id) { openTag.push('id="' + id + '"'); }
- if (classes.length) { openTag.push('class="' + classes.join(" ") + '"'); }
+ openTag = ["<" + tag];
- if (!jQuery.isEmptyObject(style)) {
+ if (id) { openTag.push('id="' + this._escapeAttribute(id) + '"'); }
+ if (classes) { openTag.push('class="' + this._escapeAttribute(classes.toDOM()) + '"'); }
+
+ if (style) {
for (prop in style) {
if (style.hasOwnProperty(prop)) {
- styleBuffer.push(prop + ':' + style[prop] + ';');
+ styleBuffer += (prop + ':' + this._escapeAttribute(style[prop]) + ';');
}
}
- openTag.push('style="' + styleBuffer.join("") + '"');
+ openTag.push('style="' + styleBuffer + '"');
}
- for (prop in attrs) {
- if (attrs.hasOwnProperty(prop)) {
- openTag.push(prop + '="' + attrs[prop] + '"');
+ if (attrs) {
+ for (prop in attrs) {
+ if (attrs.hasOwnProperty(prop)) {
+ openTag.push(prop + '="' + this._escapeAttribute(attrs[prop]) + '"');
+ }
}
}
openTag = openTag.join(" ") + '>';
}
- var childBuffers = get(this, 'childBuffers');
+ var childBuffers = this.childBuffers;
- childBuffers.forEach(function(buffer) {
+ forEach(childBuffers, function(buffer) {
var stringy = typeof buffer === 'string';
content += (stringy ? buffer : buffer.string());
});
if (tag) {
return openTag + content + "</" + tag + ">";
} else {
return content;
}
+ },
+
+ _escapeAttribute: function(value) {
+ // Escaping only double quotes is probably sufficient, but it can't hurt to do a few more
+ return value.toString()
+ .replace(/&/g, '&')
+ .replace(/</g, '<')
+ .replace(/>/g, '>')
+ .replace(/'/g, ''')
+ .replace(/"/g, '"');
}
-});
+};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -10784,11 +12186,11 @@
Sets up event listeners for standard browser events.
This will be called after the browser sends a DOMContentReady event. By
default, it will set up all of the listeners on the document body. If you
- would like to register the listeners on different element, set the event
+ would like to register the listeners on a different element, set the event
dispatcher's `root` property.
*/
setup: function(addedEvents) {
var event, events = {
touchstart : 'touchStart',
@@ -10798,10 +12200,11 @@
keydown : 'keyDown',
keyup : 'keyUp',
keypress : 'keyPress',
mousedown : 'mouseDown',
mouseup : 'mouseUp',
+ contextmenu : 'contextMenu',
click : 'click',
dblclick : 'doubleClick',
mousemove : 'mouseMove',
focusin : 'focusIn',
focusout : 'focusOut',
@@ -10816,21 +12219,21 @@
dragover : 'dragOver',
drop : 'drop',
dragend : 'dragEnd'
};
- jQuery.extend(events, addedEvents || {});
+ Ember.$.extend(events, addedEvents || {});
var rootElement = Ember.$(get(this, 'rootElement'));
ember_assert(fmt('You cannot use the same root element (%@) multiple times in an Ember.Application', [rootElement.selector || rootElement[0].tagName]), !rootElement.is('.ember-application'));
ember_assert('You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application', !rootElement.closest('.ember-application').length);
ember_assert('You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application', !rootElement.find('.ember-application').length);
rootElement.addClass('ember-application');
- ember_assert('Unable to add "ember-application" class to rootElement. Make sure you the body or an element in the body.', rootElement.is('.ember-application'));
+ ember_assert('Unable to add "ember-application" class to rootElement. Make sure you set rootElement to the body or an element in the body.', rootElement.is('.ember-application'));
for (event in events) {
if (events.hasOwnProperty(event)) {
this.setupHandler(rootElement, event, events[event]);
}
@@ -10874,10 +12277,20 @@
evt.stopPropagation();
}
return result;
});
+
+ rootElement.delegate('[data-ember-action]', event + '.ember', function(evt) {
+ var actionId = Ember.$(evt.currentTarget).attr('data-ember-action'),
+ action = Ember.Handlebars.ActionHelper.registeredActions[actionId],
+ handler = action.handler;
+
+ if (action.eventName === eventName) {
+ return handler(evt);
+ }
+ });
},
/** @private */
_findNearestEventManager: function(view, eventName) {
var manager = null;
@@ -10894,11 +12307,11 @@
/** @private */
_dispatchEvent: function(object, evt, eventName, view) {
var result = true;
- handler = object[eventName];
+ var handler = object[eventName];
if (Ember.typeOf(handler) === 'function') {
result = handler.call(object, evt, view);
evt.stopPropagation();
}
else {
@@ -10921,14 +12334,15 @@
Ember.$(rootElement).undelegate('.ember').removeClass('ember-application');
return this._super();
}
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -10954,14 +12368,13 @@
The root of an Ember.Application must not be removed during the course of the
page's lifetime. If you have only a single conceptual application for the
entire page, and are not embedding any third-party Ember applications
in your page, use the default document root for your application.
- You only need to specify the root if your page contains multiple instances
+ You only need to specify the root if your page contains multiple instances
of Ember.Application.
- @since Ember 2.0
@extends Ember.Object
*/
Ember.Application = Ember.Namespace.extend(
/** @scope Ember.Application.prototype */{
@@ -11006,12 +12419,10 @@
var self = this;
Ember.$(document).ready(function() {
self.didBecomeReady();
});
}
-
- this._super();
},
/** @private */
didBecomeReady: function() {
var eventDispatcher = get(this, 'eventDispatcher'),
@@ -11035,66 +12446,71 @@
}
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
// Add a new named queue for rendering views that happens
// after bindings have synced.
var queues = Ember.run.queues;
-queues.splice(jQuery.inArray('actions', queues)+1, 0, 'render');
+queues.splice(Ember.$.inArray('actions', queues)+1, 0, 'render');
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+})();
-(function(exports) {
+
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
/*globals ember_assert */
var get = Ember.get, set = Ember.set, addObserver = Ember.addObserver;
var getPath = Ember.getPath, meta = Ember.meta, fmt = Ember.String.fmt;
var a_slice = Array.prototype.slice;
+var a_forEach = Ember.ArrayUtils.forEach;
var childViewsProperty = Ember.computed(function() {
var childViews = get(this, '_childViews');
var ret = Ember.A();
- childViews.forEach(function(view) {
+ a_forEach(childViews, function(view) {
if (view.isVirtual) {
ret.pushObjects(get(view, 'childViews'));
} else {
ret.push(view);
}
});
return ret;
-}).property('_childViews.@each').cacheable();
+}).property().cacheable();
/**
@static
Global hash of shared templates. This will automatically be populated
@@ -11103,27 +12519,35 @@
@type Hash
*/
Ember.TEMPLATES = {};
+var invokeForState = {
+ preRender: {},
+ inBuffer: {},
+ hasElement: {},
+ inDOM: {},
+ destroyed: {}
+};
+
/**
@class
@since Ember 0.9
@extends Ember.Object
*/
-Ember.View = Ember.Object.extend(
+Ember.View = Ember.Object.extend(Ember.Evented,
/** @scope Ember.View.prototype */ {
/** @private */
concatenatedProperties: ['classNames', 'classNameBindings', 'attributeBindings'],
/**
@type Boolean
- @default YES
+ @default true
@constant
*/
- isView: YES,
+ isView: true,
// ..........................................................
// TEMPLATE SUPPORT
//
@@ -11138,10 +12562,22 @@
@default null
*/
templateName: null,
/**
+ The name of the layout to lookup if no layout is provided.
+
+ Ember.View will look for a template with this name in this view's
+ `templates` object. By default, this will be a global object
+ shared in `Ember.TEMPLATES`.
+
+ @type String
+ @default null
+ */
+ layoutName: null,
+
+ /**
The hash in which to look for `templateName`.
@type Ember.Object
@default Ember.TEMPLATES
*/
@@ -11159,29 +12595,58 @@
@type Function
*/
template: Ember.computed(function(key, value) {
if (value !== undefined) { return value; }
- var templateName = get(this, 'templateName'), template;
+ var templateName = get(this, 'templateName'),
+ template = this.templateForName(templateName, 'template');
- if (templateName) { template = get(get(this, 'templates'), templateName); }
+ return template || get(this, 'defaultTemplate');
+ }).property('templateName').cacheable(),
- // If there is no template but a templateName has been specified,
- // try to lookup as a spade module
- if (!template && templateName) {
- if ('undefined' !== require && require.exists) {
- if (require.exists(templateName)) { template = require(templateName); }
- }
+ /**
+ The controller managing this view. If this property is set, it will be made
+ made available for use by the template.
- if (!template) {
- throw new Ember.Error(fmt('%@ - Unable to find template "%@".', [this, templateName]));
- }
+ @type Object
+ */
+ controller: null,
+
+ /**
+ A view may contain a layout. A layout is a regular template but
+ supersedes the `template` property during rendering. It is the
+ responsibility of the layout template to retrieve the `template`
+ property from the view and render it in the correct location.
+
+ This is useful for a view that has a shared wrapper, but which delegates
+ the rendering of the contents of the wrapper to the `template` property
+ on a subclass.
+
+ @field
+ @type Function
+ */
+ layout: Ember.computed(function(key, value) {
+ if (arguments.length === 2) { return value; }
+
+ var layoutName = get(this, 'layoutName'),
+ layout = this.templateForName(layoutName, 'layout');
+
+ return layout || get(this, 'defaultLayout');
+ }).property('layoutName').cacheable(),
+
+ templateForName: function(name, type) {
+ if (!name) { return; }
+
+ var templates = get(this, 'templates'),
+ template = get(templates, name);
+
+ if (!template) {
+ throw new Ember.Error(fmt('%@ - Unable to find %@ "%@".', [this, type, name]));
}
- // return the template, or undefined if no template was found
- return template || get(this, 'defaultTemplate');
- }).property('templateName').cacheable(),
+ return template;
+ },
/**
The object from which templates should access properties.
This object will be passed to the template function each time the render
@@ -11191,14 +12656,44 @@
By default, this will be the view itself.
@type Object
*/
templateContext: Ember.computed(function(key, value) {
- return value !== undefined ? value : this;
+ if (arguments.length === 2) {
+ set(this, '_templateContext', value);
+ return value;
+ } else {
+ return get(this, '_templateContext');
+ }
}).cacheable(),
/**
+ @private
+
+ Private copy of the view's template context. This can be set directly
+ by Handlebars without triggering the observer that causes the view
+ to be re-rendered.
+ */
+ _templateContext: Ember.computed(function(key, value) {
+ if (arguments.length === 2) {
+ return value;
+ } else {
+ return this;
+ }
+ }).cacheable(),
+
+ /**
+ If a value that affects template rendering changes, the view should be
+ re-rendered to reflect the new value.
+
+ @private
+ */
+ _displayPropertyDidChange: Ember.observer(function() {
+ this.rerender();
+ }, 'templateContext', 'controller'),
+
+ /**
If the view is currently inserted into the DOM of a parent view, this
property will point to the parent of the view.
@type Ember.View
@default null
@@ -11225,11 +12720,11 @@
If false, the view will appear hidden in DOM.
@type Boolean
@default null
*/
- isVisible: null,
+ isVisible: true,
/**
Array of child views. You should never edit this array directly.
Instead, use appendChild and removeFromParent.
@@ -11237,11 +12732,11 @@
@type Array
@default []
*/
childViews: childViewsProperty,
- _childViews: Ember.A(),
+ _childViews: [],
/**
Return the nearest ancestor that is an instance of the provided
class.
@@ -11322,10 +12817,12 @@
When the parent view changes, recursively invalidate
collectionView, itemView, and contentView
*/
_parentViewDidChange: Ember.observer(function() {
+ if (this.isDestroying) { return; }
+
this.invokeRecursively(function(view) {
view.propertyDidChange('collectionView');
view.propertyDidChange('itemView');
view.propertyDidChange('contentView');
});
@@ -11341,16 +12838,34 @@
`templateContext` will be the view itself unless you override it.
@param {Ember.RenderBuffer} buffer The render buffer
*/
render: function(buffer) {
- var template = get(this, 'template');
+ // If this view has a layout, it is the responsibility of the
+ // the layout to render the view's template. Otherwise, render the template
+ // directly.
+ var template = get(this, 'layout') || get(this, 'template');
if (template) {
- var context = get(this, 'templateContext'),
- data = { view: this, buffer: buffer, isRenderData: true };
+ var context = get(this, '_templateContext'),
+ templateData = this.get('templateData'),
+ controller = this.get('controller');
+ var data = {
+ view: this,
+ buffer: buffer,
+ isRenderData: true,
+ keywords: {
+ view: get(this, 'concreteView')
+ }
+ };
+
+ // If the view has a controller specified, make it available to the
+ // template. If not, pass along the parent template's controller,
+ // if it exists.
+ data.keywords.controller = controller || (templateData && templateData.keywords.controller);
+
// Invoke the template with the provided template context, which
// is the view by default. A hash of data is also passed that provides
// the template with access to the view and render buffer.
// The template should write directly to the render buffer instead
@@ -11362,21 +12877,33 @@
if (output !== undefined) { buffer.push(output); }
}
},
invokeForState: function(name) {
- var parent = this, states = parent.states;
- var stateName = get(this, 'state'), state;
+ var stateName = this.state, args;
+ // try to find the function for the state in the cache
+ if (fn = invokeForState[stateName][name]) {
+ args = a_slice.call(arguments);
+ args[0] = this;
+
+ return fn.apply(this, args);
+ }
+
+ // otherwise, find and cache the function for this state
+ var parent = this, states = parent.states, state;
+
while (states) {
state = states[stateName];
while (state) {
var fn = state[name];
if (fn) {
- var args = a_slice.call(arguments, 1);
+ invokeForState[stateName][name] = fn;
+
+ args = a_slice.call(arguments, 1);
args.unshift(this);
return fn.apply(this, args);
}
@@ -11404,13 +12931,12 @@
rerender: function() {
return this.invokeForState('rerender');
},
clearRenderedChildren: function() {
- var viewMeta = meta(this)['Ember.View'],
- lengthBefore = viewMeta.lengthBeforeRender,
- lengthAfter = viewMeta.lengthAfterRender;
+ var lengthBefore = this.lengthBeforeRender,
+ lengthAfter = this.lengthAfterRender;
// If there were child views created during the last call to render(),
// remove them under the assumption that they will be re-created when
// we re-render.
@@ -11437,11 +12963,11 @@
if (!classBindings) { return; }
// Loop through all of the configured bindings. These will be either
// property names ('isUrgent') or property paths relative to the view
// ('content.isUrgent')
- classBindings.forEach(function(binding) {
+ a_forEach(classBindings, function(binding) {
// Variable in which the old class value is saved. The observer function
// closes over this variable, so it knows which string to remove when
// the property changes.
var oldClass, property;
@@ -11501,25 +13027,29 @@
var attributeBindings = get(this, 'attributeBindings'),
attributeValue, elem, type;
if (!attributeBindings) { return; }
- attributeBindings.forEach(function(attributeName) {
+ a_forEach(attributeBindings, function(binding) {
+ var split = binding.split(':'),
+ property = split[0],
+ attributeName = split[1] || property;
+
// Create an observer to add/remove/change the attribute if the
// JavaScript property changes.
var observer = function() {
elem = this.$();
- attributeValue = get(this, attributeName);
+ attributeValue = get(this, property);
- Ember.View.applyAttributeBindings(elem, attributeName, attributeValue)
+ Ember.View.applyAttributeBindings(elem, attributeName, attributeValue);
};
- addObserver(this, attributeName, observer);
+ addObserver(this, property, observer);
// Determine the current value and add it to the render buffer
// if necessary.
- attributeValue = get(this, attributeName);
+ attributeValue = get(this, property);
Ember.View.applyAttributeBindings(buffer, attributeName, attributeValue);
}, this);
},
/**
@@ -11531,29 +13061,34 @@
For example, if the view has property `isUrgent` that evaluates to true,
passing `isUrgent` to this method will return `"is-urgent"`.
*/
_classStringForProperty: function(property) {
var split = property.split(':'),
- property = split[0],
className = split[1];
- var val = Ember.getPath(this, property);
+ property = split[0];
+ // TODO: Remove this `false` when the `getPath` globals support is removed
+ var val = Ember.getPath(this, property, false);
+ if (val === undefined && Ember.isGlobalPath(property)) {
+ val = Ember.getPath(window, property);
+ }
+
// If value is a Boolean and true, return the dasherized property
// name.
- if (val === YES) {
+ if (val === true) {
if (className) { return className; }
// Normalize property path to be suitable for use
// as a class name. For exaple, content.foo.barBaz
// becomes bar-baz.
var parts = property.split('.');
return Ember.String.dasherize(parts[parts.length-1]);
- // If the value is not NO, undefined, or null, return the current
+ // If the value is not false, undefined, or null, return the current
// value of the property.
- } else if (val !== NO && val !== undefined && val !== null) {
+ } else if (val !== false && val !== undefined && val !== null) {
return val;
// Nothing to display. Return null so that the old class is removed
// but no new class is added.
} else {
@@ -11640,13 +13175,10 @@
*/
appendTo: function(target) {
// Schedule the DOM element to be created and appended to the given
// element after bindings have synchronized.
this._insertElementLater(function() {
- if (get(this, 'isVisible') === null) {
- set(this, 'isVisible', true);
- }
this.$().appendTo(target);
});
return this;
},
@@ -11692,11 +13224,11 @@
});
@param {Function} fn the function that inserts the element into the DOM
*/
_insertElementLater: function(fn) {
- Ember.run.schedule('render', this, 'invokeForState', 'insertElement', fn);
+ Ember.run.schedule('render', this, this.invokeForState, 'insertElement', fn);
},
/**
Appends the view's element to the document body. If the view does
not have an HTML representation yet, `createElement()` will be called
@@ -11739,10 +13271,15 @@
*/
elementId: Ember.computed(function(key, value) {
return value !== undefined ? value : Ember.guidFor(this);
}).cacheable(),
+ /** @private */
+ _elementIdDidChange: Ember.beforeObserver(function() {
+ throw "Changing a view's elementId after creation is not allowed.";
+ }, 'elementId'),
+
/**
Attempts to discover the element in the parent element. The default
implementation looks for an element with an ID of elementId (or the view's
guid if elementId is null). You can override this method to provide your
own form of lookup. For example, if you want to discover your element
@@ -11751,11 +13288,11 @@
@param {DOMElement} parentElement The parent's DOM element
@returns {DOMElement} The discovered element
*/
findElementInParentElement: function(parentElem) {
var id = "#" + get(this, 'elementId');
- return jQuery(id)[0] || jQuery(id, parentElem)[0];
+ return Ember.$(id)[0] || Ember.$(id, parentElem)[0];
},
/**
Creates a new renderBuffer with the passed tagName. You can override this
method to provide further customization to the buffer if needed. Normally
@@ -11763,12 +13300,17 @@
@returns {Ember.RenderBuffer}
*/
renderBuffer: function(tagName) {
tagName = tagName || get(this, 'tagName');
- if (tagName == null) { tagName = 'div'; }
+ // Explicitly check for null or undefined, as tagName
+ // may be an empty string, which would evaluate to false.
+ if (tagName === null || tagName === undefined) {
+ tagName = 'div';
+ }
+
return Ember.RenderBuffer(tagName);
},
/**
Creates a DOM representation of the view and all of its
@@ -11799,10 +13341,17 @@
document body.
*/
didInsertElement: Ember.K,
/**
+ Called when the view is about to rerender, but before anything has
+ been torn down. This is a good opportunity to tear down any manual
+ observers you have installed based on the DOM state
+ */
+ willRerender: Ember.K,
+
+ /**
Run this callback on the current view and recursively on child views.
@private
*/
invokeRecursively: function(fn) {
@@ -11832,11 +13381,11 @@
works so we let people know. We can remove this warning code later.
*/
_notifyWillInsertElement: function(fromPreRender) {
this.invokeRecursively(function(view) {
if (fromPreRender) { view._willInsertElementAccessUnsupported = true; }
- view.willInsertElement();
+ view.fire('willInsertElement');
view._willInsertElementAccessUnsupported = false;
});
},
/**
@@ -11845,15 +13394,27 @@
Invokes the receiver's didInsertElement() method if it exists and then
invokes the same on all child views.
*/
_notifyDidInsertElement: function() {
this.invokeRecursively(function(view) {
- view.didInsertElement();
+ view.fire('didInsertElement');
});
},
/**
+ @private
+
+ Invokes the receiver's willRerender() method if it exists and then
+ invokes the same on all child views.
+ */
+ _notifyWillRerender: function() {
+ this.invokeRecursively(function(view) {
+ view.fire('willRerender');
+ });
+ },
+
+ /**
Destroys any existing element along with the element for any child views
as well. If the view does not currently have a element, then this method
will do nothing.
If you implement willDestroyElement() on your view, then this method will
@@ -11884,11 +13445,11 @@
Invokes the `willDestroyElement` callback on the view and child views.
*/
_notifyWillDestroyElement: function() {
this.invokeRecursively(function(view) {
- view.willDestroyElement();
+ view.fire('willDestroyElement');
});
},
/** @private (nodoc) */
_elementWillChange: Ember.beforeObserver(function() {
@@ -11935,11 +13496,10 @@
@param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
passed, a default buffer, using the current view's `tagName`, will
be used.
*/
renderToBuffer: function(parentBuffer, bufferOperation) {
- var viewMeta = meta(this)['Ember.View'];
var buffer;
Ember.run.sync();
// Determine where in the parent buffer to start the new buffer.
@@ -11952,27 +13512,29 @@
// create a new buffer relative to the original using the
// provided buffer operation (for example, `insertAfter` will
// insert a new buffer after the "parent buffer").
if (parentBuffer) {
var tagName = get(this, 'tagName');
- if (tagName == null) { tagName = 'div'; }
+ if (tagName === null || tagName === undefined) {
+ tagName = 'div';
+ }
buffer = parentBuffer[bufferOperation](tagName);
} else {
buffer = this.renderBuffer();
}
- viewMeta.buffer = buffer;
- this.transitionTo('inBuffer');
+ this.buffer = buffer;
+ this.transitionTo('inBuffer', false);
- viewMeta.lengthBeforeRender = getPath(this, '_childViews.length');
+ this.lengthBeforeRender = get(get(this, '_childViews'), 'length');
this.beforeRender(buffer);
this.render(buffer);
this.afterRender(buffer);
- viewMeta.lengthAfterRender = getPath(this, '_childViews.length');
+ this.lengthAfterRender = get(get(this, '_childViews'), 'length');
return buffer;
},
beforeRender: function(buffer) {
@@ -11993,11 +13555,11 @@
// This isn't needed for class name bindings because they use the
// existing classNames infrastructure.
this._applyAttributeBindings(buffer);
- get(this, 'classNames').forEach(function(name){ buffer.addClass(name); });
+ a_forEach(get(this, 'classNames'), function(name){ buffer.addClass(name); });
buffer.id(get(this, 'elementId'));
var role = get(this, 'ariaRole');
if (role) {
buffer.attr('role', role);
@@ -12107,10 +13669,12 @@
enabled: true
});
*/
attributeBindings: [],
+ state: 'preRender',
+
// .......................................................
// CORE DISPLAY METHODS
//
/**
@@ -12120,32 +13684,27 @@
- configure childViews
- register the view with the global views hash, which is used for event
dispatch
*/
init: function() {
- set(this, 'state', 'preRender');
-
- var parentView = get(this, '_parentView');
-
this._super();
// Register the view for event handling. This hash is used by
// Ember.RootResponder to dispatch incoming events.
Ember.View.views[get(this, 'elementId')] = this;
- var childViews = Ember.A(get(this, '_childViews').slice());
+ var childViews = get(this, '_childViews').slice();
+
// setup child views. be sure to clone the child views array first
set(this, '_childViews', childViews);
+ ember_assert("Only arrays are allowed for 'classNameBindings'", Ember.typeOf(this.classNameBindings) === 'array');
+ this.classNameBindings = Ember.A(this.classNameBindings.slice());
- this.classNameBindings = Ember.A(get(this, 'classNameBindings').slice());
- this.classNames = Ember.A(get(this, 'classNames').slice());
+ ember_assert("Only arrays are allowed for 'classNames'", Ember.typeOf(this.classNames) === 'array');
+ this.classNames = Ember.A(this.classNames.slice());
- set(this, 'domManager', this.domManagerClass.create({ view: this }));
-
- meta(this)["Ember.View"] = {};
-
var viewController = get(this, 'viewController');
if (viewController) {
viewController = Ember.getPath(viewController);
if (viewController) {
set(viewController, 'view', this);
@@ -12162,17 +13721,24 @@
@param {Ember.View} view
@returns {Ember.View} receiver
*/
removeChild: function(view) {
+ // If we're destroying, the entire subtree will be
+ // freed, and the DOM will be handled separately,
+ // so no need to mess with childViews.
+ if (this.isDestroying) { return; }
+
// update parent node
set(view, '_parentView', null);
// remove view from childViews array.
var childViews = get(this, '_childViews');
- childViews.removeObject(view);
+ Ember.ArrayUtils.removeObject(childViews, view);
+ this.propertyDidChange('childViews');
+
return this;
},
/**
Removes all children from the parentView.
@@ -12206,48 +13772,50 @@
if (parent) { parent.removeChild(this); }
return this;
},
/**
- You must call this method on a view to destroy the view (and all of its
+ You must call `destroy` on a view to destroy the view (and all of its
child views). This will remove the view from any parent node, then make
sure that the DOM element managed by the view can be released by the
memory manager.
*/
- destroy: function() {
- if (get(this, 'isDestroyed')) { return; }
-
+ willDestroy: function() {
// calling this._super() will nuke computed properties and observers,
// so collect any information we need before calling super.
- var viewMeta = meta(this)['Ember.View'],
- childViews = get(this, '_childViews'),
+ var childViews = get(this, '_childViews'),
parent = get(this, '_parentView'),
elementId = get(this, 'elementId'),
- childLen = childViews.length;
+ childLen;
// destroy the element -- this will avoid each child view destroying
// the element over and over again...
if (!this.removedFromDOM) { this.destroyElement(); }
+ // remove from non-virtual parent view if viewName was specified
+ if (this.viewName) {
+ var nonVirtualParentView = get(this, 'parentView');
+ if (nonVirtualParentView) {
+ set(nonVirtualParentView, this.viewName, null);
+ }
+ }
+
// remove from parent if found. Don't call removeFromParent,
// as removeFromParent will try to remove the element from
// the DOM again.
if (parent) { parent.removeChild(this); }
- Ember.Descriptor.setup(this, 'state', 'destroyed');
+ this.state = 'destroyed';
- this._super();
-
+ childLen = get(childViews, 'length');
for (var i=childLen-1; i>=0; i--) {
childViews[i].removedFromDOM = true;
childViews[i].destroy();
}
// next remove view from global hash
delete Ember.View.views[get(this, 'elementId')];
-
- return this; // done with cleanup
},
/**
Instantiates a view to be added to the childViews array during view
initialization. You generally will not call this method directly unless
@@ -12259,22 +13827,30 @@
@param {Hash} [attrs] Attributes to add
@returns {Ember.View} new instance
@test in createChildViews
*/
createChildView: function(view, attrs) {
+ var coreAttrs;
+
if (Ember.View.detect(view)) {
- view = view.create(attrs || {}, { _parentView: this });
+ coreAttrs = { _parentView: this };
+ if (attrs) {
+ view = view.create(coreAttrs, attrs);
+ } else {
+ view = view.create(coreAttrs);
+ }
- var viewName = attrs && attrs.viewName || view.viewName;
+ var viewName = view.viewName;
// don't set the property on a virtual view, as they are invisible to
// consumers of the view API
if (viewName) { set(get(this, 'concreteView'), viewName, view); }
} else {
ember_assert('must pass instance of View', view instanceof Ember.View);
set(view, '_parentView', this);
}
+
return view;
},
becameVisible: Ember.K,
becameHidden: Ember.K,
@@ -12298,11 +13874,11 @@
this._notifyBecameHidden();
}
}, 'isVisible'),
_notifyBecameVisible: function() {
- this.becameVisible();
+ this.fire('becameVisible');
this.forEachChildView(function(view) {
var isVisible = get(view, 'isVisible');
if (isVisible || isVisible === null) {
@@ -12310,11 +13886,11 @@
}
});
},
_notifyBecameHidden: function() {
- this.becameHidden();
+ this.fire('becameHidden');
this.forEachChildView(function(view) {
var isVisible = get(view, 'isVisible');
if (isVisible || isVisible === null) {
view._notifyBecameHidden();
@@ -12334,24 +13910,37 @@
return false;
},
clearBuffer: function() {
this.invokeRecursively(function(view) {
- meta(view)['Ember.View'].buffer = null;
+ this.buffer = null;
});
},
transitionTo: function(state, children) {
- set(this, 'state', state);
+ this.state = state;
if (children !== false) {
this.forEachChildView(function(view) {
view.transitionTo(state);
});
}
},
+ /**
+ @private
+
+ Override the default event firing from Ember.Evented to
+ also call methods with the given name.
+ */
+ fire: function(name) {
+ if (this[name]) {
+ this[name].apply(this, [].slice.call(arguments, 1));
+ }
+ this._super.apply(this, arguments);
+ },
+
// .......................................................
// EVENT HANDLING
//
/**
@@ -12388,53 +13977,52 @@
// inside the buffer, legal manipulations are done on the buffer
// once the view has been inserted into the DOM, legal manipulations
// are done on the DOM element.
-Ember.View.reopen({
- states: Ember.View.states,
- domManagerClass: Ember.Object.extend({
- view: this,
+/** @private */
+var DOMManager = {
+ prepend: function(view, childView) {
+ childView._insertElementLater(function() {
+ var element = view.$();
+ element.prepend(childView.$());
+ });
+ },
- prepend: function(childView) {
- var view = get(this, 'view');
+ after: function(view, nextView) {
+ nextView._insertElementLater(function() {
+ var element = view.$();
+ element.after(nextView.$());
+ });
+ },
- childView._insertElementLater(function() {
- var element = view.$();
- element.prepend(childView.$());
- });
- },
+ replace: function(view) {
+ var element = get(view, 'element');
- after: function(nextView) {
- var view = get(this, 'view');
+ set(view, 'element', null);
- nextView._insertElementLater(function() {
- var element = view.$();
- element.after(nextView.$());
- });
- },
+ view._insertElementLater(function() {
+ Ember.$(element).replaceWith(get(view, 'element'));
+ });
+ },
- replace: function() {
- var view = get(this, 'view');
- var element = get(view, 'element');
+ remove: function(view) {
+ var elem = get(view, 'element');
- set(view, 'element', null);
+ set(view, 'element', null);
- view._insertElementLater(function() {
- Ember.$(element).replaceWith(get(view, 'element'));
- });
- },
+ Ember.$(elem).remove();
+ },
- remove: function() {
- var view = get(this, 'view');
- var elem = get(view, 'element');
+ empty: function(view) {
+ view.$().empty();
+ }
+};
- set(view, 'element', null);
-
- Ember.$(elem).remove();
- }
- })
+Ember.View.reopen({
+ states: Ember.View.states,
+ domManager: DOMManager
});
// Create a global view hash.
Ember.View.views = {};
@@ -12444,11 +14032,11 @@
// at view initialization time. This happens in Ember.ContainerView's init
// method.
Ember.View.childViewsProperty = childViewsProperty;
Ember.View.applyAttributeBindings = function(elem, name, value) {
- var type = typeof value;
+ var type = Ember.typeOf(value);
var currentValue = elem.attr(name);
// if this changes, also change the logic in ember-handlebars/lib/helpers/binding.js
if ((type === 'string' || (type === 'number' && !isNaN(value))) && value !== currentValue) {
elem.attr(name, value);
@@ -12457,14 +14045,15 @@
} else if (!value) {
elem.removeAttr(name);
}
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -12495,14 +14084,15 @@
Ember.View.reopen({
states: Ember.View.states
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -12527,10 +14117,12 @@
console.error("Getting element from willInsertElement is unreliable and no longer supported.");
}
return Ember.$();
},
+ empty: Ember.K,
+
// This exists for the removal warning, remove later
getElement: function(view){
if (view._willInsertElementAccessUnsupported) {
console.error("Getting element from willInsertElement is unreliable and no longer supported.");
}
@@ -12549,14 +14141,15 @@
return value;
}
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -12576,25 +14169,31 @@
},
// when a view is rendered in a buffer, rerendering it simply
// replaces the existing buffer with a new one
rerender: function(view) {
- var buffer = meta(view)['Ember.View'].buffer;
+ ember_deprecate("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM. Because this is avoidable and the cause of significant performance issues in applications, this behavior is deprecated. If you want to use the debugger to find out what caused this, you can set ENV.RAISE_ON_DEPRECATION to true.");
+ view._notifyWillRerender();
+
view.clearRenderedChildren();
- view.renderToBuffer(buffer, 'replaceWith');
+ view.renderToBuffer(view.buffer, 'replaceWith');
},
// when a view is rendered in a buffer, appending a child
// view will render that view and append the resulting
// buffer into its buffer.
appendChild: function(view, childView, options) {
- var buffer = meta(view)['Ember.View'].buffer;
+ var buffer = view.buffer;
childView = this.createChildView(childView, options);
- get(view, '_childViews').pushObject(childView);
+ get(view, '_childViews').push(childView);
+
childView.renderToBuffer(buffer);
+
+ view.propertyDidChange('childViews');
+
return childView;
},
// when a view is rendered in a buffer, destroying the
// element will simply destroy the buffer and put the
@@ -12605,10 +14204,14 @@
view.transitionTo('preRender');
return view;
},
+ empty: function() {
+ throw "EWOT";
+ },
+
// It should be impossible for a rendered view to be scheduled for
// insertion.
insertElement: function() {
throw "You can't insert an element that has already been rendered";
},
@@ -12626,14 +14229,15 @@
return value;
}
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -12667,28 +14271,39 @@
},
// once the view has been inserted into the DOM, rerendering is
// deferred to allow bindings to synchronize.
rerender: function(view) {
+ view._notifyWillRerender();
+
view.clearRenderedChildren();
- get(view, 'domManager').replace();
+ view.domManager.replace(view);
return view;
},
// once the view is already in the DOM, destroying it removes it
// from the DOM, nukes its element, and puts it back into the
// preRender state.
destroyElement: function(view) {
- view.invokeRecursively(function(view) {
- this.willDestroyElement();
- });
+ view._notifyWillDestroyElement();
- get(view, 'domManager').remove();
+ view.domManager.remove(view);
return view;
},
+ empty: function(view) {
+ var _childViews = get(view, '_childViews'), len, idx;
+ if (_childViews) {
+ len = get(_childViews, 'length');
+ for (idx = 0; idx < len; idx++) {
+ _childViews[idx]._notifyWillDestroyElement();
+ }
+ }
+ view.domManager.empty(view);
+ },
+
// Handle events from `Ember.EventDispatcher`
handleEvent: function(view, eventName, evt) {
var handler = view[eventName];
if (Ember.typeOf(handler) === 'function') {
return handler.call(view, evt);
@@ -12704,14 +14319,15 @@
insertElement: function() {
throw "You can't insert an element into the DOM that has already been inserted";
}
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -12728,10 +14344,13 @@
throw fmt(destroyedError, ['rerender']);
},
destroyElement: function() {
throw fmt(destroyedError, ['destroyElement']);
},
+ empty: function() {
+ throw fmt(destroyedError, ['empty']);
+ },
setElement: function() {
throw fmt(destroyedError, ["set('element', ...)"]);
},
@@ -12739,47 +14358,222 @@
// the view has been destroyed between scheduling and execution
insertElement: Ember.K
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+})();
-(function(exports) {
+
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
var get = Ember.get, set = Ember.set, meta = Ember.meta;
+var forEach = Ember.ArrayUtils.forEach;
var childViewsProperty = Ember.computed(function() {
return get(this, '_childViews');
}).property('_childViews').cacheable();
+/**
+ @class
+ @extends Ember.View
+
+ A `ContainerView` is an `Ember.View` subclass that allows for manual or programatic
+ management of a view's `childViews` array that will correctly update the `ContainerView`
+ instance's rendered DOM representation.
+
+ ## Setting Initial Child Views
+ The initial array of child views can be set in one of two ways. You can provide
+ a `childViews` property at creation time that contains instance of `Ember.View`:
+
+
+ aContainer = Ember.ContainerView.create({
+ childViews: [Ember.View.create(), Ember.View.create()]
+ })
+
+ You can also provide a list of property names whose values are instances of `Ember.View`:
+
+ aContainer = Ember.ContainerView.create({
+ childViews: ['aView', 'bView', 'cView'],
+ aView: Ember.View.create(),
+ bView: Ember.View.create()
+ cView: Ember.View.create()
+ })
+
+ The two strategies can be combined:
+
+ aContainer = Ember.ContainerView.create({
+ childViews: ['aView', Ember.View.create()],
+ aView: Ember.View.create()
+ })
+
+ Each child view's rendering will be inserted into the container's rendered HTML in the same
+ order as its position in the `childViews` property.
+
+ ## Adding and Removing Child Views
+ The views in a container's `childViews` array should be added and removed by manipulating
+ the `childViews` property directly.
+
+ To remove a view pass that view into a `removeObject` call on the container's `childViews` property.
+
+ Given an empty `<body>` the following code
+
+ aContainer = Ember.ContainerView.create({
+ classNames: ['the-container'],
+ childViews: ['aView', 'bView'],
+ aView: Ember.View.create({
+ template: Ember.Handlebars.compile("A")
+ }),
+ bView: Ember.View.create({
+ template: Ember.Handlebars.compile("B")
+ })
+ })
+
+ aContainer.appendTo('body')
+
+ Results in the HTML
+
+ <div class="ember-view the-container">
+ <div class="ember-view">A</div>
+ <div class="ember-view">B</div>
+ </div>
+
+ Removing a view
+
+ aContainer.get('childViews') // [aContainer.aView, aContainer.bView]
+ aContainer.get('childViews').removeObject(aContainer.get('bView'))
+ aContainer.get('childViews') // [aContainer.aView]
+
+ Will result in the following HTML
+
+ <div class="ember-view the-container">
+ <div class="ember-view">A</div>
+ </div>
+
+
+ Similarly, adding a child view is accomplished by adding `Ember.View` instances to the
+ container's `childViews` property.
+
+ Given an empty `<body>` the following code
+
+ aContainer = Ember.ContainerView.create({
+ classNames: ['the-container'],
+ childViews: ['aView', 'bView'],
+ aView: Ember.View.create({
+ template: Ember.Handlebars.compile("A")
+ }),
+ bView: Ember.View.create({
+ template: Ember.Handlebars.compile("B")
+ })
+ })
+
+ aContainer.appendTo('body')
+
+ Results in the HTML
+
+ <div class="ember-view the-container">
+ <div class="ember-view">A</div>
+ <div class="ember-view">B</div>
+ </div>
+
+ Adding a view
+
+ AnotherViewClass = Ember.View.extend({
+ template: Ember.Handlebars.compile("Another view")
+ })
+
+ aContainer.get('childViews') // [aContainer.aView, aContainer.bView]
+ aContainer.get('childViews').pushObject(AnotherViewClass.create())
+ aContainer.get('childViews') // [aContainer.aView, <AnotherViewClass instance>]
+
+ Will result in the following HTML
+
+ <div class="ember-view the-container">
+ <div class="ember-view">A</div>
+ <div class="ember-view">Another view</div>
+ </div>
+
+
+ Direct manipulation of childViews presence or absence in the DOM via calls to
+ `remove` or `removeFromParent` or calls to a container's `removeChild` may not behave
+ correctly.
+
+ Calling `remove()` on a child view will remove the view's HTML, but it will remain as part of its
+ container's `childView`s property.
+
+ Calling `removeChild()` on the container will remove the passed view instance from the container's
+ `childView`s but keep its HTML within the container's rendered view.
+
+ Calling `removeFromParent()` behaves as expected but should be avoided in favor of direct
+ manipulation of a container's `childViews` property.
+
+ aContainer = Ember.ContainerView.create({
+ classNames: ['the-container'],
+ childViews: ['aView', 'bView'],
+ aView: Ember.View.create({
+ template: Ember.Handlebars.compile("A")
+ }),
+ bView: Ember.View.create({
+ template: Ember.Handlebars.compile("B")
+ })
+ })
+
+ aContainer.appendTo('body')
+
+ Results in the HTML
+
+ <div class="ember-view the-container">
+ <div class="ember-view">A</div>
+ <div class="ember-view">B</div>
+ </div>
+
+ Calling `aContainer.get('aView').removeFromParent()` will result in the following HTML
+
+ <div class="ember-view the-container">
+ <div class="ember-view">A</div>
+ <div class="ember-view">B</div>
+ </div>
+
+ And the `Ember.View` instance stored in `aContainer.aView` will be removed from `aContainer`'s
+ `childViews` array.
+
+
+ ## Templates and Layout
+ A `template`, `templateName`, `defaultTempalte`, `layout`, `layoutName` or `defaultLayout`
+ property on a container view will not result in the template or layout being rendered.
+ The HTML contents of a `Ember.ContainerView`'s DOM representation will only be the rendered HTML
+ of its child views.
+*/
+
Ember.ContainerView = Ember.View.extend({
init: function() {
var childViews = get(this, 'childViews');
Ember.defineProperty(this, 'childViews', childViewsProperty);
this._super();
var _childViews = get(this, '_childViews');
- childViews.forEach(function(viewName, idx) {
+ forEach(childViews, function(viewName, idx) {
var view;
if ('string' === typeof viewName) {
view = get(this, viewName);
view = this.createChildView(view);
@@ -12788,33 +14582,21 @@
view = this.createChildView(viewName);
}
_childViews[idx] = view;
}, this);
- },
- /**
- Extends Ember.View's implementation of renderToBuffer to
- set up an array observer on the child views array. This
- observer will detect when child views are added or removed
- and update the DOM to reflect the mutation.
+ // Make the _childViews array observable
+ Ember.A(_childViews);
- Note that we set up this array observer in the `renderToBuffer`
- method because any views set up previously will be rendered the first
- time the container is rendered.
-
- @private
- */
- renderToBuffer: function() {
- var ret = this._super.apply(this, arguments);
-
+ // Sets up an array observer on the child views array. This
+ // observer will detect when child views are added or removed
+ // and update the DOM to reflect the mutation.
get(this, 'childViews').addArrayObserver(this, {
willChange: 'childViewsWillChange',
didChange: 'childViewsDidChange'
});
-
- return ret;
},
/**
Instructs each child view to render to the passed render buffer.
@@ -12831,11 +14613,11 @@
When the container view is destroyed, tear down the child views
array observer.
@private
*/
- destroy: function() {
+ willDestroy: function() {
get(this, 'childViews').removeArrayObserver(this, {
willChange: 'childViewsWillChange',
didChange: 'childViewsDidChange'
});
@@ -12855,12 +14637,12 @@
@param {Number} removed the number of child views removed
**/
childViewsWillChange: function(views, start, removed) {
if (removed === 0) { return; }
- var changedViews = views.slice(start, removed);
- this.setParentView(changedViews, null);
+ var changedViews = views.slice(start, start+removed);
+ this.initializeViews(changedViews, null, null);
this.invokeForState('childViewsWillChange', views, start, removed);
},
/**
@@ -12882,20 +14664,21 @@
var len = get(views, 'length');
// No new child views were added; bail out.
if (added === 0) return;
- var changedViews = views.slice(start, added);
- this.setParentView(changedViews, this);
+ var changedViews = views.slice(start, start+added);
+ this.initializeViews(changedViews, this, get(this, 'templateData'));
// Let the current state handle the changes
this.invokeForState('childViewsDidChange', views, start, added);
},
- setParentView: function(views, parentView) {
- views.forEach(function(view) {
+ initializeViews: function(views, parentView, templateData) {
+ forEach(views, function(view) {
set(view, '_parentView', parentView);
+ set(view, 'templateData', templateData);
});
},
/**
Schedules a child view to be inserted into the DOM after bindings have
@@ -12906,13 +14689,13 @@
be inserted
@private
*/
_scheduleInsertion: function(view, prev) {
if (prev) {
- prev.get('domManager').after(view);
+ prev.domManager.after(prev, view);
} else {
- this.get('domManager').prepend(view);
+ this.domManager.prepend(this, view);
}
}
});
// Ember.ContainerView extends the default view states to provide different
@@ -12920,11 +14703,11 @@
Ember.ContainerView.states = {
parent: Ember.View.states,
inBuffer: {
childViewsDidChange: function(parentView, views, start, added) {
- var buffer = meta(parentView)['Ember.View'].buffer,
+ var buffer = parentView.buffer,
startWith, prev, prevBuffer, view;
// Determine where to begin inserting the child view(s) in the
// render buffer.
if (start === 0) {
@@ -12942,20 +14725,20 @@
}
for (var i=startWith; i<start+added; i++) {
prev = view;
view = views[i];
- prevBuffer = meta(prev)['Ember.View'].buffer;
+ prevBuffer = prev.buffer;
view.renderToBuffer(prevBuffer, 'insertAfter');
}
}
},
hasElement: {
childViewsWillChange: function(view, views, start, removed) {
for (var i=start; i<start+removed; i++) {
- views[i].destroyElement();
+ views[i].remove();
}
},
childViewsDidChange: function(view, views, start, added) {
// If the DOM element for this container view already exists,
@@ -12978,14 +14761,15 @@
Ember.ContainerView.reopen({
states: Ember.ContainerView.states
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
@@ -12993,11 +14777,119 @@
var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt;
/**
@class
@since Ember 0.9
- @extends Ember.View
+ @extends Ember.ContainerView
+
+ `Ember.CollectionView` is an `Ember.View` descendent responsible for managing a
+ collection (an array or array-like object) by maintaing a child view object and
+ associated DOM representation for each item in the array and ensuring that child
+ views and their associated rendered HTML are updated when items in the array
+ are added, removed, or replaced.
+
+ ## Setting content
+ The managed collection of objects is referenced as the `Ember.CollectionView` instance's
+ `content` property.
+
+ someItemsView = Ember.CollectionView.create({
+ content: ['A', 'B','C']
+ })
+
+ The view for each item in the collection will have its `content` property set
+ to the item.
+
+ ## Specifying itemViewClass
+ By default the view class for each item in the managed collection will be an instance
+ of `Ember.View`. You can supply a different class by setting the `CollectionView`'s
+ `itemViewClass` property.
+
+ Given an empty `<body>` and the following code:
+
+
+ someItemsView = Ember.CollectionView.create({
+ classNames: ['a-collection'],
+ content: ['A','B','C'],
+ itemViewClass: Ember.View.extend({
+ template: Ember.Handlebars.compile("the letter: {{content}}")
+ })
+ })
+
+ someItemsView.appendTo('body')
+
+ Will result in the following HTML structure
+
+ <div class="ember-view a-collection">
+ <div class="ember-view">the letter: A</div>
+ <div class="ember-view">the letter: B</div>
+ <div class="ember-view">the letter: C</div>
+ </div>
+
+
+ ## Automatic matching of parent/child tagNames
+ Setting the `tagName` property of a `CollectionView` to any of
+ "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
+ in the item views receiving an appropriately matched `tagName` property.
+
+
+ Given an empty `<body>` and the following code:
+
+ anUndorderedListView = Ember.CollectionView.create({
+ tagName: 'ul',
+ content: ['A','B','C'],
+ itemViewClass: Ember.View.extend({
+ template: Ember.Handlebars.compile("the letter: {{content}}")
+ })
+ })
+
+ anUndorderedListView.appendTo('body')
+
+ Will result in the following HTML structure
+
+ <ul class="ember-view a-collection">
+ <li class="ember-view">the letter: A</li>
+ <li class="ember-view">the letter: B</li>
+ <li class="ember-view">the letter: C</li>
+ </ul>
+
+ Additional tagName pairs can be provided by adding to `Ember.CollectionView.CONTAINER_MAP `
+
+ Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
+
+
+ ## Empty View
+ You can provide an `Ember.View` subclass to the `Ember.CollectionView` instance as its
+ `emptyView` property. If the `content` property of a `CollectionView` is set to `null`
+ or an empty array, an instance of this view will be the `CollectionView`s only child.
+
+ aListWithNothing = Ember.CollectionView.create({
+ classNames: ['nothing']
+ content: null,
+ emptyView: Ember.View.extend({
+ template: Ember.Handlebars.compile("The collection is empty")
+ })
+ })
+
+ aListWithNothing.appendTo('body')
+
+ Will result in the following HTML structure
+
+ <div class="ember-view nothing">
+ <div class="ember-view">
+ The collection is empty
+ </div>
+ </div>
+
+ ## Adding and Removing items
+ The `childViews` property of a `CollectionView` should not be directly manipulated. Instead,
+ add, remove, replace items from its `content` property. This will trigger
+ appropriate changes to its rendered HTML.
+
+ ## Use in templates via the `{{collection}}` Ember.Handlebars helper
+ Ember.Handlebars provides a helper specifically for adding `CollectionView`s to templates.
+ See `Ember.Handlebars.collection` for more details
+
*/
Ember.CollectionView = Ember.ContainerView.extend(
/** @scope Ember.CollectionView.prototype */ {
/**
@@ -13020,10 +14912,11 @@
@type Ember.View
@default Ember.View
*/
itemViewClass: Ember.View,
+ /** @private */
init: function() {
var ret = this._super();
this._contentDidChange();
return ret;
},
@@ -13046,25 +14939,23 @@
*/
_contentDidChange: Ember.observer(function() {
var content = get(this, 'content');
if (content) {
- ember_assert(fmt("an Ember.CollectionView's content must implement Ember.Array. You passed %@", [content]), content.addArrayObserver != null);
+ ember_assert(fmt("an Ember.CollectionView's content must implement Ember.Array. You passed %@", [content]), Ember.Array.detect(content));
content.addArrayObserver(this);
}
var len = content ? get(content, 'length') : 0;
this.arrayDidChange(content, 0, null, len);
}, 'content'),
- destroy: function() {
+ willDestroy: function() {
var content = get(this, 'content');
if (content) { content.removeArrayObserver(this); }
this._super();
-
- return this;
},
arrayWillChange: function(content, start, removedCount) {
// If the contents were empty before and this template collection has an
// empty view remove it now.
@@ -13077,12 +14968,21 @@
// Note that we loop from the end of the array to the beginning because
// we are mutating it as we go.
var childViews = get(this, 'childViews'), childView, idx, len;
len = get(childViews, 'length');
+
+ var removingAll = removedCount === len;
+
+ if (removingAll) {
+ this.invokeForState('empty');
+ }
+
for (idx = start + removedCount - 1; idx >= start; idx--) {
- childViews[idx].destroy();
+ childView = childViews[idx];
+ if (removingAll) { childView.removedFromDOM = true; }
+ childView.destroy();
}
},
/**
Called when a mutation to the underlying content array occurs.
@@ -13135,14 +15035,14 @@
childViews.replace(start, 0, addedViews);
},
createChildView: function(view, attrs) {
- var view = this._super(view, attrs);
+ view = this._super(view, attrs);
var itemTagName = get(view, 'tagName');
- var tagName = itemTagName == null ? Ember.CollectionView.CONTAINER_MAP[get(this, 'tagName')] : itemTagName;
+ var tagName = (itemTagName === null || itemTagName === undefined) ? Ember.CollectionView.CONTAINER_MAP[get(this, 'tagName')] : itemTagName;
set(view, 'tagName', tagName);
return view;
}
@@ -13167,103 +15067,698 @@
tfoot: 'tr',
tr: 'td',
select: 'option'
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+})();
-(function(exports) {
+
+
+(function() {
// ==========================================================================
// Project: Ember - JavaScript Application Framework
// Copyright: ©2006-2011 Strobe Inc. and contributors.
// Portions ©2008-2011 Apple Inc. All rights reserved.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-ember_assert("Ember requires jQuery 1.6 or 1.7", window.jQuery && jQuery().jquery.match(/^1\.[67](.\d+)?$/));
-Ember.$ = window.jQuery;
-})({});
-(function(exports) {
-var get = Ember.get, set = Ember.set;
+/*globals jQuery*/
+})();
+
+(function() {
+var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
+
Ember.State = Ember.Object.extend({
isState: true,
parentState: null,
start: null,
+ name: null,
+ path: Ember.computed(function() {
+ var parentPath = getPath(this, 'parentState.path'),
+ path = get(this, 'name');
+ if (parentPath) {
+ path = parentPath + '.' + path;
+ }
+
+ return path;
+ }).property().cacheable(),
+
init: function() {
var states = get(this, 'states'), foundStates;
+ var name;
// As a convenience, loop over the properties
// of this state and look for any that are other
// Ember.State instances or classes, and move them
// to the `states` hash. This avoids having to
// create an explicit separate hash.
if (!states) {
states = {};
- for (var name in this) {
- if (name === "constructor") { continue; }
- value = this.setupChild(name, this[name]);
- if (value) {
- foundStates = true;
- states[name] = value;
- }
+ for (name in this) {
+ if (name === "constructor") { continue; }
+ this.setupChild(states, name, this[name]);
}
- if (foundStates) { set(this, 'states', states); }
+ set(this, 'states', states);
} else {
- for (var name in states) {
- this.setupChild(name, states[name]);
+ for (name in states) {
+ this.setupChild(states, name, states[name]);
}
}
set(this, 'routes', {});
},
- setupChild: function(name, value) {
+ setupChild: function(states, name, value) {
if (!value) { return false; }
if (Ember.State.detect(value)) {
- value = value.create();
+ value = value.create({
+ name: name
+ });
+ } else if (value.isState) {
+ set(value, 'name', name);
}
if (value.isState) {
set(value, 'parentState', this);
- set(value, 'name', (get(this, 'name') || '') + '.' + name);
- return value;
+ states[name] = value;
}
-
- return false;
},
enter: Ember.K,
exit: Ember.K
});
-})({});
+})();
-(function(exports) {
-var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt;
-Ember.LOG_STATE_TRANSITIONS = false;
+(function() {
+var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt;
/**
@class
-*/
+
+ StateManager is part of Ember's implementation of a finite state machine. A StateManager
+ instance manages a number of properties that are instances of `Ember.State`,
+ tracks the current active state, and triggers callbacks when states have changed.
+
+ ## Defining States
+
+ The states of StateManager can be declared in one of two ways. First, you can define
+ a `states` property that contains all the states:
+
+ managerA = Ember.StateManager.create({
+ states: {
+ stateOne: Ember.State.create(),
+ stateTwo: Ember.State.create()
+ }
+ })
+
+ managerA.get('states')
+ // {
+ // stateOne: Ember.State.create(),
+ // stateTwo: Ember.State.create()
+ // }
+
+ You can also add instances of `Ember.State` (or an `Ember.State` subclass) directly as properties
+ of a StateManager. These states will be collected into the `states` property for you.
+
+ managerA = Ember.StateManager.create({
+ stateOne: Ember.State.create(),
+ stateTwo: Ember.State.create()
+ })
+
+ managerA.get('states')
+ // {
+ // stateOne: Ember.State.create(),
+ // stateTwo: Ember.State.create()
+ // }
+
+ ## The Initial State
+ When created a StateManager instance will immediately enter into the state
+ defined as its `start` property or the state referenced by name in its
+ `initialState` property:
+
+ managerA = Ember.StateManager.create({
+ start: Ember.State.create({})
+ })
+
+ managerA.getPath('currentState.name') // 'start'
+
+ managerB = Ember.StateManager.create({
+ initialState: 'beginHere',
+ beginHere: Ember.State.create({})
+ })
+
+ managerB.getPath('currentState.name') // 'beginHere'
+
+ Because it is a property you may also provided a computed function if you wish to derive
+ an `initialState` programmatically:
+
+ managerC = Ember.StateManager.create({
+ initialState: function(){
+ if (someLogic) {
+ return 'active';
+ } else {
+ return 'passive';
+ }
+ }.property(),
+ active: Ember.State.create({})
+ passive: Ember.State.create({})
+ })
+
+ ## Moving Between States
+ A StateManager can have any number of Ember.State objects as properties
+ and can have a single one of these states as its current state.
+
+ Calling `goToState` transitions between states:
+
+ robotManager = Ember.StateManager.create({
+ initialState: 'poweredDown',
+ poweredDown: Ember.State.create({}),
+ poweredUp: Ember.State.create({})
+ })
+
+ robotManager.getPath('currentState.name') // 'poweredDown'
+ robotManager.goToState('poweredUp')
+ robotManager.getPath('currentState.name') // 'poweredUp'
+
+ Before transitioning into a new state the existing `currentState` will have its
+ `exit` method called with with the StateManager instance as its first argument and
+ an object representing the the transition as its second argument.
+
+ After transitioning into a new state the new `currentState` will have its
+ `enter` method called with with the StateManager instance as its first argument and
+ an object representing the the transition as its second argument.
+
+ robotManager = Ember.StateManager.create({
+ initialState: 'poweredDown',
+ poweredDown: Ember.State.create({
+ exit: function(stateManager, transition){
+ console.log("exiting the poweredDown state")
+ }
+ }),
+ poweredUp: Ember.State.create({
+ enter: function(stateManager, transition){
+ console.log("entering the poweredUp state. Destroy all humans.")
+ }
+ })
+ })
+
+ robotManager.getPath('currentState.name') // 'poweredDown'
+ robotManager.goToState('poweredUp')
+ // will log
+ // 'exiting the poweredDown state'
+ // 'entering the poweredUp state. Destroy all humans.'
+
+
+ Once a StateManager is already in a state, subsequent attempts to enter that state will
+ not trigger enter or exit method calls. Attempts to transition into a state that the
+ manager does not have will result in no changes in the StateManager's current state:
+
+ robotManager = Ember.StateManager.create({
+ initialState: 'poweredDown',
+ poweredDown: Ember.State.create({
+ exit: function(stateManager, transition){
+ console.log("exiting the poweredDown state")
+ }
+ }),
+ poweredUp: Ember.State.create({
+ enter: function(stateManager, transition){
+ console.log("entering the poweredUp state. Destroy all humans.")
+ }
+ })
+ })
+
+ robotManager.getPath('currentState.name') // 'poweredDown'
+ robotManager.goToState('poweredUp')
+ // will log
+ // 'exiting the poweredDown state'
+ // 'entering the poweredUp state. Destroy all humans.'
+ robotManager.goToState('poweredUp') // no logging, no state change
+
+ robotManager.goToState('someUnknownState') // silently fails
+ robotManager.getPath('currentState.name') // 'poweredUp'
+
+
+ Each state property may itself contain properties that are instances of Ember.State.
+ The StateManager can transition to specific sub-states in a series of goToState method calls or
+ via a single goToState with the full path to the specific state. The StateManager will also
+ keep track of the full path to its currentState
+
+
+ robotManager = Ember.StateManager.create({
+ initialState: 'poweredDown',
+ poweredDown: Ember.State.create({
+ charging: Ember.State.create(),
+ charged: Ember.State.create()
+ }),
+ poweredUp: Ember.State.create({
+ mobile: Ember.State.create(),
+ stationary: Ember.State.create()
+ })
+ })
+
+ robotManager.getPath('currentState.name') // 'poweredDown'
+
+ robotManager.goToState('poweredUp')
+ robotManager.getPath('currentState.name') // 'poweredUp'
+
+ robotManager.goToState('mobile')
+ robotManager.getPath('currentState.name') // 'mobile'
+
+ // transition via a state path
+ robotManager.goToState('poweredDown.charging')
+ robotManager.getPath('currentState.name') // 'charging'
+
+ robotManager.getPath('currentState.get.path') // 'poweredDown.charging'
+
+ Enter transition methods will be called for each state and nested child state in their
+ hierarchical order. Exit methods will be called for each state and its nested states in
+ reverse hierarchical order.
+
+ Exit transitions for a parent state are not called when entering into one of its child states,
+ only when transitioning to a new section of possible states in the hierarchy.
+
+ robotManager = Ember.StateManager.create({
+ initialState: 'poweredDown',
+ poweredDown: Ember.State.create({
+ enter: function(){},
+ exit: function(){
+ console.log("exited poweredDown state")
+ },
+ charging: Ember.State.create({
+ enter: function(){},
+ exit: function(){}
+ }),
+ charged: Ember.State.create({
+ enter: function(){
+ console.log("entered charged state")
+ },
+ exit: function(){
+ console.log("exited charged state")
+ }
+ })
+ }),
+ poweredUp: Ember.State.create({
+ enter: function(){
+ console.log("entered poweredUp state")
+ },
+ exit: function(){},
+ mobile: Ember.State.create({
+ enter: function(){
+ console.log("entered mobile state")
+ },
+ exit: function(){}
+ }),
+ stationary: Ember.State.create({
+ enter: function(){},
+ exit: function(){}
+ })
+ })
+ })
+
+
+ robotManager.get('currentState.get.path') // 'poweredDown'
+ robotManager.goToState('charged')
+ // logs 'entered charged state'
+ // but does *not* log 'exited poweredDown state'
+ robotManager.getPath('currentState.name') // 'charged
+
+ robotManager.goToState('poweredUp.mobile')
+ // logs
+ // 'exited charged state'
+ // 'exited poweredDown state'
+ // 'entered poweredUp state'
+ // 'entered mobile state'
+
+ During development you can set a StateManager's `enableLogging` property to `true` to
+ receive console messages of state transitions.
+
+ robotManager = Ember.StateManager.create({
+ enableLogging: true
+ })
+
+ ## Managing currentState with Actions
+ To control which transitions between states are possible for a given state, StateManager
+ can receive and route action messages to its states via the `send` method. Calling to `send` with
+ an action name will begin searching for a method with the same name starting at the current state
+ and moving up through the parent states in a state hierarchy until an appropriate method is found
+ or the StateManager instance itself is reached.
+
+ If an appropriately named method is found it will be called with the state manager as the first
+ argument and an optional `context` object as the second argument.
+
+ managerA = Ember.StateManager.create({
+ initialState: 'stateOne.substateOne.subsubstateOne',
+ stateOne: Ember.State.create({
+ substateOne: Ember.State.create({
+ anAction: function(manager, context){
+ console.log("an action was called")
+ },
+ subsubstateOne: Ember.State.create({})
+ })
+ })
+ })
+
+ managerA.getPath('currentState.name') // 'subsubstateOne'
+ managerA.send('anAction')
+ // 'stateOne.substateOne.subsubstateOne' has no anAction method
+ // so the 'anAction' method of 'stateOne.substateOne' is called
+ // and logs "an action was called"
+ // with managerA as the first argument
+ // and no second argument
+
+ someObject = {}
+ managerA.send('anAction', someObject)
+ // the 'anAction' method of 'stateOne.substateOne' is called again
+ // with managerA as the first argument and
+ // someObject as the second argument.
+
+
+ If the StateManager attempts to send an action but does not find an appropriately named
+ method in the current state or while moving upwards through the state hierarchy
+ it will throw a new Ember.Error. Action detection only moves upwards through the state hierarchy
+ from the current state. It does not search in other portions of the hierarchy.
+
+ managerB = Ember.StateManager.create({
+ initialState: 'stateOne.substateOne.subsubstateOne',
+ stateOne: Ember.State.create({
+ substateOne: Ember.State.create({
+ subsubstateOne: Ember.State.create({})
+ })
+ }),
+ stateTwo: Ember.State.create({
+ anAction: function(manager, context){
+ // will not be called below because it is
+ // not a parent of the current state
+ }
+ })
+ })
+
+ managerB.getPath('currentState.name') // 'subsubstateOne'
+ managerB.send('anAction')
+ // Error: <Ember.StateManager:ember132> could not
+ // respond to event anAction in state stateOne.substateOne.subsubstateOne.
+
+ Inside of an action method the given state should delegate `goToState` calls on its
+ StateManager.
+
+ robotManager = Ember.StateManager.create({
+ initialState: 'poweredDown.charging',
+ poweredDown: Ember.State.create({
+ charging: Ember.State.create({
+ chargeComplete: function(manager, context){
+ manager.goToState('charged')
+ }
+ }),
+ charged: Ember.State.create({
+ boot: function(manager, context){
+ manager.goToState('poweredUp')
+ }
+ })
+ }),
+ poweredUp: Ember.State.create({
+ beginExtermination: function(manager, context){
+ manager.goToState('rampaging')
+ },
+ rampaging: Ember.State.create()
+ })
+ })
+
+ robotManager.getPath('currentState.name') // 'charging'
+ robotManager.send('boot') // throws error, no boot action
+ // in current hierarchy
+ robotManager.getPath('currentState.name') // remains 'charging'
+
+ robotManager.send('beginExtermination') // throws error, no beginExtermination
+ // action in current hierarchy
+ robotManager.getPath('currentState.name') // remains 'charging'
+
+ robotManager.send('chargeComplete')
+ robotManager.getPath('currentState.name') // 'charged'
+
+ robotManager.send('boot')
+ robotManager.getPath('currentState.name') // 'poweredUp'
+
+ robotManager.send('beginExtermination', allHumans)
+ robotManager.getPath('currentState.name') // 'rampaging'
+
+
+ ## Interactions with Ember's View System.
+ When combined with instances of `Ember.ViewState`, StateManager is designed to
+ interact with Ember's view system to control which views are added to
+ and removed from the DOM based on the manager's current state.
+
+ By default, a StateManager will manage views inside the 'body' element. This can be
+ customized by setting the `rootElement` property to a CSS selector of an existing
+ HTML element you would prefer to receive view rendering.
+
+
+ viewStates = Ember.StateManager.create({
+ rootElement: '#some-other-element'
+ })
+
+ You can also specify a particular instance of `Ember.ContainerView` you would like to receive
+ view rendering by setting the `rootView` property. You will be responsible for placing
+ this element into the DOM yourself.
+
+ aLayoutView = Ember.ContainerView.create()
+
+ // make sure this view instance is added to the browser
+ aLayoutView.appendTo('body')
+
+ App.viewStates = Ember.StateManager.create({
+ rootView: aLayoutView
+ })
+
+
+ Once you have an instance of StateManager controlling a view, you can provide states
+ that are instances of `Ember.ViewState`. When the StateManager enters a state
+ that is an instance of `Ember.ViewState` that `ViewState`'s `view` property will be
+ instantiated and inserted into the StateManager's `rootView` or `rootElement`.
+ When a state is exited, the `ViewState`'s view will be removed from the StateManager's
+ view.
+
+ ContactListView = Ember.View.extend({
+ classNames: ['my-contacts-css-class'],
+ defaultTemplate: Ember.Handlebars.compile('<h2>People</h2>')
+ })
+
+ PhotoListView = Ember.View.extend({
+ classNames: ['my-photos-css-class'],
+ defaultTemplate: Ember.Handlebars.compile('<h2>Photos</h2>')
+ })
+
+ viewStates = Ember.StateManager.create({
+ showingPeople: Ember.ViewState.create({
+ view: ContactListView
+ }),
+ showingPhotos: Ember.ViewState.create({
+ view: PhotoListView
+ })
+ })
+
+ viewStates.goToState('showingPeople')
+
+ The above code will change the rendered HTML from
+
+ <body></body>
+
+ to
+
+ <body>
+ <div id="ember1" class="ember-view my-contacts-css-class">
+ <h2>People</h2>
+ </div>
+ </body>
+
+ Changing the current state via `goToState` from `showingPeople` to
+ `showingPhotos` will remove the `showingPeople` view and add the `showingPhotos` view:
+
+ viewStates.goToState('showingPhotos')
+
+ will change the rendered HTML to
+
+ <body>
+ <div id="ember2" class="ember-view my-photos-css-class">
+ <h2>Photos</h2>
+ </div>
+ </body>
+
+
+ When entering nested `ViewState`s, each state's view will be draw into the the StateManager's
+ `rootView` or `rootElement` as siblings.
+
+
+ ContactListView = Ember.View.extend({
+ classNames: ['my-contacts-css-class'],
+ defaultTemplate: Ember.Handlebars.compile('<h2>People</h2>')
+ })
+
+ EditAContactView = Ember.View.extend({
+ classNames: ['editing-a-contact-css-class'],
+ defaultTemplate: Ember.Handlebars.compile('Editing...')
+ })
+
+ viewStates = Ember.StateManager.create({
+ showingPeople: Ember.ViewState.create({
+ view: ContactListView,
+
+ withEditingPanel: Ember.ViewState.create({
+ view: EditAContactView
+ })
+ })
+ })
+
+
+ viewStates.goToState('showingPeople.withEditingPanel')
+
+
+ Will result in the following rendered HTML:
+
+ <body>
+ <div id="ember2" class="ember-view my-contacts-css-class">
+ <h2>People</h2>
+ </div>
+
+ <div id="ember2" class="ember-view editing-a-contact-css-class">
+ Editing...
+ </div>
+ </body>
+
+
+ ViewState views are added and removed from their StateManager's view via their
+ `enter` and `exit` methods. If you need to override these methods, be sure to call
+ `_super` to maintain the adding and removing behavior:
+
+ viewStates = Ember.StateManager.create({
+ aState: Ember.ViewState.create({
+ view: Ember.View.extend({}),
+ enter: function(manager, transition){
+ // calling _super ensures this view will be
+ // properly inserted
+ this._super();
+
+ // now you can do other things
+ }
+ })
+ })
+
+ ## Managing Multiple Sections of A Page With States
+ Multiple StateManagers can be combined to control multiple areas of an application's rendered views.
+ Given the following HTML body:
+
+ <body>
+ <div id='sidebar-nav'>
+ </div>
+ <div id='content-area'>
+ </div>
+ </body>
+
+ You could separately manage view state for each section with two StateManagers
+
+ navigationStates = Ember.StateManager.create({
+ rootElement: '#sidebar-nav',
+ userAuthenticated: Em.ViewState.create({
+ view: Ember.View.extend({})
+ }),
+ userNotAuthenticated: Em.ViewState.create({
+ view: Ember.View.extend({})
+ })
+ })
+
+ contentStates = Ember.StateManager.create({
+ rootElement: '#content-area',
+ books: Em.ViewState.create({
+ view: Ember.View.extend({})
+ }),
+ music: Em.ViewState.create({
+ view: Ember.View.extend({})
+ })
+ })
+
+
+ If you prefer to start with an empty body and manage state programmatically you
+ can also take advantage of StateManager's `rootView` property and the ability of
+ `Ember.ContainerView`s to manually manage their child views.
+
+
+ dashboard = Ember.ContainerView.create({
+ childViews: ['navigationAreaView', 'contentAreaView'],
+ navigationAreaView: Ember.ContainerView.create({}),
+ contentAreaView: Ember.ContainerView.create({})
+ })
+
+ navigationStates = Ember.StateManager.create({
+ rootView: dashboard.get('navigationAreaView'),
+ userAuthenticated: Em.ViewState.create({
+ view: Ember.View.extend({})
+ }),
+ userNotAuthenticated: Em.ViewState.create({
+ view: Ember.View.extend({})
+ })
+ })
+
+ contentStates = Ember.StateManager.create({
+ rootView: dashboard.get('contentAreaView'),
+ books: Em.ViewState.create({
+ view: Ember.View.extend({})
+ }),
+ music: Em.ViewState.create({
+ view: Ember.View.extend({})
+ })
+ })
+
+ dashboard.appendTo('body')
+
+ ## User Manipulation of State via `{{action}}` Helpers
+ The Handlebars `{{action}}` helper is StateManager-aware and will use StateManager action sending
+ to connect user interaction to action-based state transitions.
+
+ Given the following body and handlebars template
+
+ <body>
+ <script type='text/x-handlebars'>
+ <a href="#" {{action "anAction" target="App.appStates"}}> Go </a>
+ </script>
+ </body>
+
+ And application code
+
+ App = Ember.Application.create()
+ App.appStates = Ember.StateManager.create({
+ initialState: 'aState',
+ aState: Ember.State.create({
+ anAction: function(manager, context){}
+ }),
+ bState: Ember.State.create({})
+ })
+
+ A user initiated click or touch event on "Go" will trigger the 'anAction' method of
+ `App.appStates.aState` with `App.appStates` as the first argument and a
+ `jQuery.Event` object as the second object. The `jQuery.Event` will include a property
+ `view` that references the `Ember.View` object that was interacted with.
+
+**/
Ember.StateManager = Ember.State.extend(
/** @scope Ember.State.prototype */ {
/**
When creating a new statemanager, look for a default state to transition
@@ -13273,11 +15768,11 @@
init: function() {
this._super();
var initialState = get(this, 'initialState');
- if (!initialState && get(this, 'start')) {
+ if (!initialState && getPath(this, 'states.start')) {
initialState = 'start';
}
if (initialState) {
this.goToState(initialState);
@@ -13287,10 +15782,19 @@
currentState: null,
/**
@property
+ If set to true, `errorOnUnhandledEvents` will cause an exception to be
+ raised if you attempt to send an event to a state manager that is not
+ handled by the current state or any of its parent states.
+ */
+ errorOnUnhandledEvent: true,
+
+ /**
+ @property
+
If the current state is a view state or the descendent of a view state,
this property will be the view associated with it. If there is no
view state active in this state manager, this value will be null.
*/
currentView: Ember.computed(function() {
@@ -13312,20 +15816,24 @@
send: function(event, context) {
this.sendRecursively(event, get(this, 'currentState'), context);
},
sendRecursively: function(event, currentState, context) {
- var log = Ember.LOG_STATE_TRANSITIONS;
+ var log = this.enableLogging;
var action = currentState[event];
if (action) {
- if (log) { console.log(fmt("STATEMANAGER: Sending event '%@' to state %@.", [event, currentState.name])); }
+ if (log) { console.log(fmt("STATEMANAGER: Sending event '%@' to state %@.", [event, get(currentState, 'path')])); }
action.call(currentState, this, context);
} else {
var parentState = get(currentState, 'parentState');
- if (parentState) { this.sendRecursively(event, parentState, context); }
+ if (parentState) {
+ this.sendRecursively(event, parentState, context);
+ } else if (get(this, 'errorOnUnhandledEvent')) {
+ throw new Ember.Error(this.toString() + " could not respond to event " + event + " in state " + getPath(this, 'currentState.path') + ".");
+ }
}
},
findStatesByRoute: function(state, route) {
if (!route || route === "") { return undefined; }
@@ -13372,11 +15880,12 @@
if (!newState) { return; }
}
newState = this.findStatesByRoute(state, name);
}
- enterStates = newState.slice(0), exitStates = exitStates.slice(0);
+ enterStates = newState.slice(0);
+ exitStates = exitStates.slice(0);
if (enterStates.length > 0) {
state = enterStates[enterStates.length - 1];
while (enterStates.length > 0 && enterStates[0] === exitStates[0]) {
@@ -13428,45 +15937,55 @@
if (!async) { transition.resume(); }
},
enterState: function(exitStates, enterStates, state) {
- var log = Ember.LOG_STATE_TRANSITIONS;
+ var log = this.enableLogging;
var stateManager = this;
+ exitStates = exitStates.slice(0).reverse();
this.asyncEach(exitStates, function(state, transition) {
state.exit(stateManager, transition);
}, function() {
this.asyncEach(enterStates, function(state, transition) {
- if (log) { console.log("STATEMANAGER: Entering " + state.name); }
+ if (log) { console.log("STATEMANAGER: Entering " + get(state, 'path')); }
state.enter(stateManager, transition);
}, function() {
- var startState = state, enteredState, initialSubstate;
+ var startState = state, enteredState, initialState;
- initialSubstate = get(startState, 'initialSubstate');
+ initialState = get(startState, 'initialState');
- if (!initialSubstate) {
- initialSubstate = 'start';
+ if (!initialState) {
+ initialState = 'start';
}
// right now, start states cannot be entered asynchronously
- while (startState = get(startState, initialSubstate)) {
+ while (startState = get(get(startState, 'states'), initialState)) {
enteredState = startState;
+
+ if (log) { console.log("STATEMANAGER: Entering " + get(startState, 'path')); }
startState.enter(stateManager);
+
+ initialState = get(startState, 'initialState');
+
+ if (!initialState) {
+ initialState = 'start';
+ }
}
set(this, 'currentState', enteredState || state);
});
});
}
});
-})({});
+})();
-(function(exports) {
+
+(function() {
var get = Ember.get, set = Ember.set;
Ember.ViewState = Ember.State.extend({
isViewState: true,
@@ -13510,22 +16029,24 @@
}
}
}
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Statecharts
// Copyright: ©2011 Living Social Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
-(function(exports) {
+})();
+
+(function() {
// ==========================================================================
// Project: metamorph
// Copyright: ©2011 My Company Inc. All rights reserved.
// ==========================================================================
@@ -13548,11 +16069,11 @@
return testEl.firstChild.innerHTML === '';
})();
// Constructor that supports either Metamorph('foo') or new
// Metamorph('foo');
- //
+ //
// Takes a string of HTML as the argument.
var Metamorph = function(html) {
var self;
@@ -13587,21 +16108,10 @@
};
// If we have the W3C range API, this process is relatively straight forward.
if (supportsRange) {
- // IE 9 supports ranges but doesn't define createContextualFragment
- if (!Range.prototype.createContextualFragment) {
- Range.prototype.createContextualFragment = function(html) {
- var frag = document.createDocumentFragment(),
- div = document.createElement("div");
- frag.appendChild(div);
- div.outerHTML = html;
- return frag;
- };
- }
-
// Get a range for the current morph. Optionally include the starting and
// ending placeholders.
rangeFor = function(morph, outerToo) {
var range = document.createRange();
var before = document.getElementById(morph.start);
@@ -13858,10 +16368,11 @@
};
afterFunc = function(html) {
// get the real starting node. see realNode for details.
var end = document.getElementById(this.end);
+ var insertBefore = end.nextSibling;
var parentNode = end.parentNode;
var nextSibling;
var node;
// get the first node for the HTML string, even in cases like
@@ -13871,11 +16382,11 @@
// copy the nodes for the HTML between the starting and ending
// placeholder.
while (node) {
nextSibling = node.nextSibling;
- parentNode.insertBefore(node, end.nextSibling);
+ parentNode.insertBefore(node, insertBefore);
node = nextSibling;
}
};
prependFunc = function(html) {
@@ -13932,13 +16443,13 @@
window.Metamorph = Metamorph;
})(this);
-})({});
+})();
-(function(exports) {
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -14063,18 +16574,68 @@
return Handlebars.template(templateSpec);
};
/**
- Lookup both on root and on window
+ If a path starts with a reserved keyword, returns the root
+ that should be used.
+ @private
+*/
+var normalizePath = Ember.Handlebars.normalizePath = function(root, path, data) {
+ var keywords = (data && data.keywords) || {},
+ keyword, isKeyword;
+
+ // Get the first segment of the path. For example, if the
+ // path is "foo.bar.baz", returns "foo".
+ keyword = path.split('.', 1)[0];
+
+ // Test to see if the first path is a keyword that has been
+ // passed along in the view's data hash. If so, we will treat
+ // that object as the new root.
+ if (keywords.hasOwnProperty(keyword)) {
+ // Look up the value in the template's data hash.
+ root = keywords[keyword];
+ isKeyword = true;
+
+ // Handle cases where the entire path is the reserved
+ // word. In that case, return the object itself.
+ if (path === keyword) {
+ path = '';
+ } else {
+ // Strip the keyword from the path and look up
+ // the remainder from the newly found root.
+ path = path.substr(keyword.length);
+ }
+ }
+
+ return { root: root, path: path, isKeyword: isKeyword };
+};
+/**
+ Lookup both on root and on window. If the path starts with
+ a keyword, the corresponding object will be looked up in the
+ template's data hash and used to resolve the path.
+
@param {Object} root The object to look up the property on
@param {String} path The path to be lookedup
+ @param {Object} options The template's option hash
*/
-Ember.Handlebars.getPath = function(root, path) {
+
+Ember.Handlebars.getPath = function(root, path, options) {
+ var data = options && options.data,
+ normalizedPath = normalizePath(root, path, data),
+ value;
+
+ // In cases where the path begins with a keyword, change the
+ // root to the value represented by that keyword, and ensure
+ // the path is relative to it.
+ root = normalizedPath.root;
+ path = normalizedPath.path;
+
// TODO: Remove this `false` when the `getPath` globals support is removed
- var value = Ember.getPath(root, path, false);
+ value = Ember.getPath(root, path, false);
+
if (value === undefined && root !== window && Ember.isGlobalPath(path)) {
value = Ember.getPath(window, path);
}
return value;
};
@@ -14100,485 +16661,98 @@
}
throw new Ember.Error(Ember.String.fmt(error, [view, path, this]));
});
-})({});
+})();
-(function(exports) {
-// ==========================================================================
-// Project: Ember Handlebar Views
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var set = Ember.set, get = Ember.get;
-// TODO: Be explicit in the class documentation that you
-// *MUST* set the value of a checkbox through Ember.
-// Updating the value of a checkbox directly via jQuery objects
-// will not work.
+(function() {
+/*jshint newcap:false*/
+var set = Ember.set, get = Ember.get, getPath = Ember.getPath;
-Ember.Checkbox = Ember.View.extend({
- title: null,
- value: false,
- disabled: false,
-
- classNames: ['ember-checkbox'],
-
- defaultTemplate: Ember.Handlebars.compile('<label><input type="checkbox" {{bindAttr checked="value" disabled="disabled"}}>{{title}}</label>'),
-
- change: function() {
- Ember.run.once(this, this._updateElementValue);
- // returning false will cause IE to not change checkbox state
+var DOMManager = {
+ remove: function(view) {
+ var morph = view.morph;
+ if (morph.isRemoved()) { return; }
+ morph.remove();
},
- _updateElementValue: function() {
- var input = this.$('input:checkbox');
- set(this, 'value', input.prop('checked'));
- }
-});
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Handlebar Views
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var get = Ember.get, set = Ember.set;
-
-/** @class */
-Ember.TextSupport = Ember.Mixin.create(
-/** @scope Ember.TextSupport.prototype */ {
-
- value: "",
-
- attributeBindings: ['placeholder', 'disabled'],
- placeholder: null,
- disabled: false,
-
- insertNewline: Ember.K,
- cancel: Ember.K,
-
- focusOut: function(event) {
- this._elementValueDidChange();
+ prepend: function(view, childView) {
+ childView._insertElementLater(function() {
+ var morph = view.morph;
+ morph.prepend(childView.outerHTML);
+ childView.outerHTML = null;
+ });
},
- change: function(event) {
- this._elementValueDidChange();
+ after: function(view, nextView) {
+ nextView._insertElementLater(function() {
+ var morph = view.morph;
+ morph.after(nextView.outerHTML);
+ nextView.outerHTML = null;
+ });
},
- keyUp: function(event) {
- this.interpretKeyEvents(event);
- },
+ replace: function(view) {
+ var morph = view.morph;
- /**
- @private
- */
- interpretKeyEvents: function(event) {
- var map = Ember.TextSupport.KEY_EVENTS;
- var method = map[event.keyCode];
+ view.transitionTo('preRender');
+ view.clearRenderedChildren();
+ var buffer = view.renderToBuffer();
- this._elementValueDidChange();
- if (method) { return this[method](event); }
+ Ember.run.schedule('render', this, function() {
+ if (get(view, 'isDestroyed')) { return; }
+ view.invalidateRecursively('element');
+ view._notifyWillInsertElement();
+ morph.replaceWith(buffer.string());
+ view.transitionTo('inDOM');
+ view._notifyDidInsertElement();
+ });
},
- _elementValueDidChange: function() {
- set(this, 'value', this.$().val());
+ empty: function(view) {
+ view.morph.html("");
}
-
-});
-
-Ember.TextSupport.KEY_EVENTS = {
- 13: 'insertNewline',
- 27: 'cancel'
};
-})({});
+// The `morph` and `outerHTML` properties are internal only
+// and not observable.
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Handlebar Views
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var get = Ember.get, set = Ember.set;
-
-/**
- @class
- @extends Ember.TextSupport
-*/
-Ember.TextField = Ember.View.extend(Ember.TextSupport,
- /** @scope Ember.TextField.prototype */ {
-
- classNames: ['ember-text-field'],
-
- tagName: "input",
- attributeBindings: ['type', 'value'],
- type: "text"
-
-});
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Handlebar Views
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var get = Ember.get, set = Ember.set;
-
-Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
- classNames: ['ember-button'],
- classNameBindings: ['isActive'],
-
- tagName: 'button',
-
- propagateEvents: false,
-
- attributeBindings: ['type', 'disabled', 'href'],
-
- // Defaults to 'button' if tagName is 'input' or 'button'
- type: Ember.computed(function(key, value) {
- var tagName = this.get('tagName');
- if (value !== undefined) { this._type = value; }
- if (this._type !== undefined) { return this._type; }
- if (tagName === 'input' || tagName === 'button') { return 'button'; }
- }).property('tagName').cacheable(),
-
- disabled: false,
-
- // Allow 'a' tags to act like buttons
- href: Ember.computed(function() {
- return this.get('tagName') === 'a' ? '#' : null;
- }).property('tagName').cacheable(),
-
- mouseDown: function() {
- if (!get(this, 'disabled')) {
- set(this, 'isActive', true);
- this._mouseDown = true;
- this._mouseEntered = true;
- }
- return get(this, 'propagateEvents');
- },
-
- mouseLeave: function() {
- if (this._mouseDown) {
- set(this, 'isActive', false);
- this._mouseEntered = false;
- }
- },
-
- mouseEnter: function() {
- if (this._mouseDown) {
- set(this, 'isActive', true);
- this._mouseEntered = true;
- }
- },
-
- mouseUp: function(event) {
- if (get(this, 'isActive')) {
- // Actually invoke the button's target and action.
- // This method comes from the Ember.TargetActionSupport mixin.
- this.triggerAction();
- set(this, 'isActive', false);
- }
-
- this._mouseDown = false;
- this._mouseEntered = false;
- return get(this, 'propagateEvents');
- },
-
- keyDown: function(event) {
- // Handle space or enter
- if (event.keyCode === 13 || event.keyCode === 32) {
- this.mouseDown();
- }
- },
-
- keyUp: function(event) {
- // Handle space or enter
- if (event.keyCode === 13 || event.keyCode === 32) {
- this.mouseUp();
- }
- },
-
- // TODO: Handle proper touch behavior. Including should make inactive when
- // finger moves more than 20x outside of the edge of the button (vs mouse
- // which goes inactive as soon as mouse goes out of edges.)
-
- touchStart: function(touch) {
- return this.mouseDown(touch);
- },
-
- touchEnd: function(touch) {
- return this.mouseUp(touch);
- }
-});
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Handlebar Views
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-var get = Ember.get, set = Ember.set;
-
-/**
- @class
- @extends Ember.TextSupport
-*/
-Ember.TextArea = Ember.View.extend(Ember.TextSupport,
-/** @scope Ember.TextArea.prototype */ {
-
- classNames: ['ember-text-area'],
-
- tagName: "textarea",
-
- /**
- @private
- */
- didInsertElement: function() {
- this._updateElementValue();
- },
-
- _updateElementValue: Ember.observer(function() {
- this.$().val(get(this, 'value'));
- }, 'value')
-
-});
-
-})({});
-
-
-(function(exports) {
-Ember.TabContainerView = Ember.View.extend();
-
-})({});
-
-
-(function(exports) {
-var get = Ember.get, getPath = Ember.getPath;
-
-Ember.TabPaneView = Ember.View.extend({
- tabsContainer: Ember.computed(function() {
- return this.nearestInstanceOf(Ember.TabContainerView);
- }).property(),
-
- isVisible: Ember.computed(function() {
- return get(this, 'viewName') === getPath(this, 'tabsContainer.currentView');
- }).property('tabsContainer.currentView')
-});
-
-})({});
-
-
-(function(exports) {
-var get = Ember.get, setPath = Ember.setPath;
-
-Ember.TabView = Ember.View.extend({
- tabsContainer: Ember.computed(function() {
- return this.nearestInstanceOf(Ember.TabContainerView);
- }).property(),
-
- mouseUp: function() {
- setPath(this, 'tabsContainer.currentView', get(this, 'value'));
- }
-});
-
-})({});
-
-
-(function(exports) {
-})({});
-
-
-(function(exports) {
-var set = Ember.set, get = Ember.get, getPath = Ember.getPath;
-
-Ember.Select = Ember.View.extend({
- tagName: 'select',
- template: Ember.Handlebars.compile(
- '{{#if prompt}}<option>{{prompt}}</option>{{/if}}' +
- '{{#each content}}{{view Ember.SelectOption contentBinding="this"}}{{/each}}'
- ),
-
- content: null,
- selection: null,
- prompt: null,
-
- optionLabelPath: 'content',
- optionValuePath: 'content',
-
-
- didInsertElement: function() {
- var selection = get(this, 'selection');
-
- if (selection) { this.selectionDidChange(); }
-
- this.change();
- },
-
- change: function() {
- var selectedIndex = this.$()[0].selectedIndex,
- content = get(this, 'content'),
- prompt = get(this, 'prompt');
-
- if (!content) { return; }
- if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
-
- if (prompt) { selectedIndex -= 1; }
- set(this, 'selection', content.objectAt(selectedIndex));
- },
-
- selectionDidChange: Ember.observer(function() {
- var el = this.$()[0],
- content = get(this, 'content'),
- selection = get(this, 'selection'),
- selectionIndex = content.indexOf(selection),
- prompt = get(this, 'prompt');
-
- if (prompt) { selectionIndex += 1; }
- if (el) { el.selectedIndex = selectionIndex; }
- }, 'selection')
-});
-
-Ember.SelectOption = Ember.View.extend({
- tagName: 'option',
- template: Ember.Handlebars.compile("{{label}}"),
- attributeBindings: ['value'],
-
- init: function() {
- this.labelPathDidChange();
- this.valuePathDidChange();
-
- this._super();
- },
-
- labelPathDidChange: Ember.observer(function() {
- var labelPath = getPath(this, 'parentView.optionLabelPath');
-
- if (!labelPath) { return; }
-
- Ember.defineProperty(this, 'label', Ember.computed(function() {
- return getPath(this, labelPath);
- }).property(labelPath).cacheable());
- }, 'parentView.optionLabelPath'),
-
- valuePathDidChange: Ember.observer(function() {
- var valuePath = getPath(this, 'parentView.optionValuePath');
-
- if (!valuePath) { return; }
-
- Ember.defineProperty(this, 'value', Ember.computed(function() {
- return getPath(this, valuePath);
- }).property(valuePath).cacheable());
- }, 'parentView.optionValuePath')
-});
-
-
-})({});
-
-
-(function(exports) {
-// ==========================================================================
-// Project: Ember Handlebar Views
-// Copyright: ©2011 Strobe Inc. and contributors.
-// License: Licensed under MIT license (see license.js)
-// ==========================================================================
-})({});
-
-
-(function(exports) {
-var set = Ember.set, get = Ember.get, getPath = Ember.getPath;
-
Ember.Metamorph = Ember.Mixin.create({
isVirtual: true,
tagName: '',
init: function() {
this._super();
- set(this, 'morph', Metamorph());
+ this.morph = Metamorph();
},
beforeRender: function(buffer) {
- var morph = get(this, 'morph');
- buffer.push(morph.startTag());
+ buffer.push(this.morph.startTag());
},
afterRender: function(buffer) {
- var morph = get(this, 'morph');
- buffer.push(morph.endTag());
+ buffer.push(this.morph.endTag());
},
createElement: function() {
var buffer = this.renderToBuffer();
- set(this, 'outerHTML', buffer.string());
+ this.outerHTML = buffer.string();
this.clearBuffer();
},
- domManagerClass: Ember.Object.extend({
- remove: function(view) {
- var morph = getPath(this, 'view.morph');
- if (morph.isRemoved()) { return; }
- getPath(this, 'view.morph').remove();
- },
-
- prepend: function(childView) {
- var view = get(this, 'view');
-
- childView._insertElementLater(function() {
- var morph = get(view, 'morph');
- morph.prepend(get(childView, 'outerHTML'));
- childView.set('outerHTML', null);
- });
- },
-
- after: function(nextView) {
- var view = get(this, 'view');
-
- nextView._insertElementLater(function() {
- var morph = get(view, 'morph');
- morph.after(get(nextView, 'outerHTML'));
- nextView.set('outerHTML', null);
- });
- },
-
- replace: function() {
- var view = get(this, 'view');
- var morph = getPath(this, 'view.morph');
-
- view.transitionTo('preRender');
- view.clearRenderedChildren();
- var buffer = view.renderToBuffer();
-
- Ember.run.schedule('render', this, function() {
- if (get(view, 'isDestroyed')) { return; }
- view._notifyWillInsertElement();
- morph.replaceWith(buffer.string());
- view.transitionTo('inDOM');
- view._notifyDidInsertElement();
- });
- }
- })
+ domManager: DOMManager
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -14588,16 +16762,16 @@
/**
@ignore
@private
@class
- Ember._BindableSpanView is a private view created by the Handlebars `{{bind}}`
+ Ember._BindableSpanView is a private view created by the Handlebars `{{bind}}`
helpers that is used to keep track of bound properties.
- Every time a property is bound using a `{{mustache}}`, an anonymous subclass
- of Ember._BindableSpanView is created with the appropriate sub-template and
- context set up. When the associated property changes, just the template for
+ Every time a property is bound using a `{{mustache}}`, an anonymous subclass
+ of Ember._BindableSpanView is created with the appropriate sub-template and
+ context set up. When the associated property changes, just the template for
this view will re-render.
*/
Ember._BindableSpanView = Ember.View.extend(Ember.Metamorph,
/** @scope Ember._BindableSpanView.prototype */{
@@ -14614,14 +16788,14 @@
/**
Whether the template rendered by this view gets passed the context object
of its parent template, or gets passed the value of retrieving `property`
from the previous context.
- For example, this is true when using the `{{#if}}` helper, because the
- template inside the helper should look up properties relative to the same
- object as outside the block. This would be NO when used with `{{#with
- foo}}` because the template should receive the object found by evaluating
+ For example, this is true when using the `{{#if}}` helper, because the
+ template inside the helper should look up properties relative to the same
+ object as outside the block. This would be false when used with `{{#with
+ foo}}` because the template should receive the object found by evaluating
`foo`.
@type Boolean
@default false
*/
@@ -14645,11 +16819,11 @@
/**
The key to look up on `previousContext` that is passed to
`shouldDisplayFunc` to determine which template to render.
- In addition, if `preserveContext` is false, this object will be passed to
+ In addition, if `preserveContext` is false, this object will be passed to
the template when rendering.
@type String
@default null
*/
@@ -14657,18 +16831,19 @@
normalizedValue: Ember.computed(function() {
var property = get(this, 'property'),
context = get(this, 'previousContext'),
valueNormalizer = get(this, 'valueNormalizerFunc'),
- result;
+ result, templateData;
// Use the current context as the result if no
// property is provided.
if (property === '') {
result = context;
} else {
- result = getPath(context, property);
+ templateData = get(this, 'templateData');
+ result = getPath(context, property, { data: templateData });
}
return valueNormalizer ? valueNormalizer(result) : result;
}).property('property', 'previousContext', 'valueNormalizerFunc'),
@@ -14685,13 +16860,13 @@
This method will first look up the `property` key on `previousContext`,
then pass that value to the `shouldDisplayFunc` function. If that returns
true, the `displayTemplate` function will be rendered to DOM. Otherwise,
`inverseTemplate`, if specified, will be rendered.
- For example, if this Ember._BindableSpan represented the {{#with foo}}
- helper, it would look up the `foo` property of its context, and
- `shouldDisplayFunc` would always return true. The object found by looking
+ For example, if this Ember._BindableSpan represented the {{#with foo}}
+ helper, it would look up the `foo` property of its context, and
+ `shouldDisplayFunc` would always return true. The object found by looking
up `foo` would be passed to `displayTemplate`.
@param {Ember.RenderBuffer} buffer
*/
render: function(buffer) {
@@ -14715,80 +16890,92 @@
set(this, 'template', displayTemplate);
// If we are preserving the context (for example, if this
// is an #if block, call the template with the same object.
if (preserveContext) {
- set(this, 'templateContext', context);
+ set(this, '_templateContext', context);
} else {
// Otherwise, determine if this is a block bind or not.
// If so, pass the specified object to the template
if (displayTemplate) {
- set(this, 'templateContext', result);
+ set(this, '_templateContext', result);
} else {
// This is not a bind block, just push the result of the
// expression to the render context and return.
- if (result == null) { result = ""; } else { result = String(result); }
+ if (result === null || result === undefined) {
+ result = "";
+ } else {
+ result = String(result);
+ }
+
if (escape) { result = Handlebars.Utils.escapeExpression(result); }
buffer.push(result);
return;
}
}
} else if (inverseTemplate) {
set(this, 'template', inverseTemplate);
if (preserveContext) {
- set(this, 'templateContext', context);
+ set(this, '_templateContext', context);
} else {
- set(this, 'templateContext', result);
+ set(this, '_templateContext', result);
}
} else {
set(this, 'template', function() { return ''; });
}
return this._super(buffer);
}
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-/*globals Handlebars */
var get = Ember.get, getPath = Ember.Handlebars.getPath, set = Ember.set, fmt = Ember.String.fmt;
+var forEach = Ember.ArrayUtils.forEach;
var EmberHandlebars = Ember.Handlebars, helpers = EmberHandlebars.helpers;
-var helpers = EmberHandlebars.helpers;
(function() {
// Binds a property into the DOM. This will create a hook in DOM that the
// KVO system will look for and update if the property changes.
var bind = function(property, options, preserveContext, shouldDisplay, valueNormalizer) {
var data = options.data,
fn = options.fn,
inverse = options.inverse,
view = data.view,
- ctx = this;
+ ctx = this,
+ normalized;
+ normalized = Ember.Handlebars.normalizePath(ctx, property, data);
+
+ ctx = normalized.root;
+ property = normalized.path;
+
// Set up observers for observable objects
if ('object' === typeof this) {
- // Create the view that will wrap the output of this template/property
+ // Create the view that will wrap the output of this template/property
// and add it to the nearest view's childViews array.
// See the documentation of Ember._BindableSpanView for more.
var bindView = view.createChildView(Ember._BindableSpanView, {
preserveContext: preserveContext,
shouldDisplayFunc: shouldDisplay,
valueNormalizerFunc: valueNormalizer,
displayTemplate: fn,
inverseTemplate: inverse,
property: property,
previousContext: ctx,
- isEscaped: options.hash.escaped
+ isEscaped: options.hash.escaped,
+ templateData: options.data
});
view.appendChild(bindView);
/** @private */
@@ -14804,17 +16991,17 @@
Ember.addObserver(ctx, property, observer);
}
} else {
// The object is not observable, so just render it out and
// be done with it.
- data.buffer.push(getPath(this, property));
+ data.buffer.push(getPath(this, property, options));
}
};
/**
- '_triageMustache' is used internally select between a binding and helper for
- the given context. Until this point, it would be hard to determine if the
+ '_triageMustache' is used internally select between a binding and helper for
+ the given context. Until this point, it would be hard to determine if the
mustache is a property reference or a regular helper reference. This triage
helper resolves that.
This would not be typically invoked by directly.
@@ -14833,20 +17020,20 @@
return helpers.bind.apply(this, arguments);
}
});
/**
- `bind` can be used to display a value, then update that value if it
- changes. For example, if you wanted to print the `title` property of
+ `bind` can be used to display a value, then update that value if it
+ changes. For example, if you wanted to print the `title` property of
`content`:
{{bind "content.title"}}
- This will return the `title` property as a string, then create a new
- observer at the specified path. If it changes, it will update the value in
- DOM. Note that if you need to support IE7 and IE8 you must modify the
- model objects properties using Ember.get() and Ember.set() for this to work as
+ This will return the `title` property as a string, then create a new
+ observer at the specified path. If it changes, it will update the value in
+ DOM. Note that if you need to support IE7 and IE8 you must modify the
+ model objects properties using Ember.get() and Ember.set() for this to work as
it relies on Ember's KVO system. For all other browsers this will be handled
for you automatically.
@private
@name Handlebars.helpers.bind
@@ -14863,11 +17050,11 @@
return !Ember.none(result);
});
});
/**
- Use the `boundIf` helper to create a conditional that re-evaluates
+ Use the `boundIf` helper to create a conditional that re-evaluates
whenever the bound value changes.
{{#boundIf "content.shouldDisplayTitle"}}
{{content.title}}
{{/boundIf}}
@@ -14897,11 +17084,11 @@
@param {Function} context
@param {Hash} options
@returns {String} HTML string
*/
EmberHandlebars.registerHelper('with', function(context, options) {
- ember_assert("You must pass exactly one argument to the with helper", arguments.length == 2);
+ ember_assert("You must pass exactly one argument to the with helper", arguments.length === 2);
ember_assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
return helpers.bind.call(options.contexts[0], context, options);
});
@@ -14911,11 +17098,11 @@
@param {Function} context
@param {Hash} options
@returns {String} HTML string
*/
EmberHandlebars.registerHelper('if', function(context, options) {
- ember_assert("You must pass exactly one argument to the if helper", arguments.length == 2);
+ ember_assert("You must pass exactly one argument to the if helper", arguments.length === 2);
ember_assert("You must pass a block to the if helper", options.fn && options.fn !== Handlebars.VM.noop);
return helpers.boundIf.call(options.contexts[0], context, options);
});
@@ -14924,11 +17111,11 @@
@param {Function} context
@param {Hash} options
@returns {String} HTML string
*/
EmberHandlebars.registerHelper('unless', function(context, options) {
- ember_assert("You must pass exactly one argument to the unless helper", arguments.length == 2);
+ ember_assert("You must pass exactly one argument to the unless helper", arguments.length === 2);
ember_assert("You must pass a block to the unless helper", options.fn && options.fn !== Handlebars.VM.noop);
var fn = options.fn, inverse = options.inverse;
options.fn = inverse;
@@ -14958,42 +17145,43 @@
var ctx = this;
// Generate a unique id for this element. This will be added as a
// data attribute to the element so it can be looked up when
// the bound property changes.
- var dataId = ++jQuery.uuid;
+ var dataId = ++Ember.$.uuid;
// Handle classes differently, as we can bind multiple classes
var classBindings = attrs['class'];
if (classBindings !== null && classBindings !== undefined) {
- var classResults = EmberHandlebars.bindClasses(this, classBindings, view, dataId);
+ var classResults = EmberHandlebars.bindClasses(this, classBindings, view, dataId, options);
ret.push('class="' + classResults.join(' ') + '"');
delete attrs['class'];
}
var attrKeys = Ember.keys(attrs);
// For each attribute passed, create an observer and emit the
// current value of the property as an attribute.
- attrKeys.forEach(function(attr) {
+ forEach(attrKeys, function(attr) {
var property = attrs[attr];
ember_assert(fmt("You must provide a String for a bound attribute, not %@", [property]), typeof property === 'string');
- var value = getPath(ctx, property);
+ var value = (property === 'this') ? ctx : getPath(ctx, property, options),
+ type = Ember.typeOf(value);
- ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), value == null || typeof value === 'number' || typeof value === 'string' || typeof value === 'boolean');
+ ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), value === null || value === undefined || type === 'number' || type === 'string' || type === 'boolean');
var observer, invoker;
/** @private */
observer = function observer() {
- var result = getPath(ctx, property);
+ var result = getPath(ctx, property, options);
- ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]), result == null || typeof result === 'number' || typeof result === 'string' || typeof result === 'boolean');
+ ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]), result === null || result === undefined || typeof result === 'number' || typeof result === 'string' || typeof result === 'boolean');
- var elem = view.$("[data-bindAttr-" + dataId + "='" + dataId + "']");
+ var elem = view.$("[data-bindattr-" + dataId + "='" + dataId + "']");
// If we aren't able to find the element, it means the element
// to which we were bound has been removed from the view.
// In that case, we can assume the template has been re-rendered
// and we need to clean up the observer.
@@ -15011,54 +17199,55 @@
};
// Add an observer to the view for when the property changes.
// When the observer fires, find the element using the
// unique data id and update the attribute to the new value.
- Ember.addObserver(ctx, property, invoker);
+ if (property !== 'this') {
+ Ember.addObserver(ctx, property, invoker);
+ }
// if this changes, also change the logic in ember-views/lib/views/view.js
- var type = typeof value;
-
if ((type === 'string' || (type === 'number' && !isNaN(value)))) {
ret.push(attr + '="' + value + '"');
} else if (value && type === 'boolean') {
ret.push(attr + '="' + attr + '"');
}
}, this);
// Add the unique identifier
- ret.push('data-bindAttr-' + dataId + '="' + dataId + '"');
+ // NOTE: We use all lower-case since Firefox has problems with mixed case in SVG
+ ret.push('data-bindattr-' + dataId + '="' + dataId + '"');
return new EmberHandlebars.SafeString(ret.join(' '));
});
/**
Helper that, given a space-separated string of property paths and a context,
- returns an array of class names. Calling this method also has the side
- effect of setting up observers at those property paths, such that if they
+ returns an array of class names. Calling this method also has the side
+ effect of setting up observers at those property paths, such that if they
change, the correct class name will be reapplied to the DOM element.
- For example, if you pass the string "fooBar", it will first look up the
- "fooBar" value of the context. If that value is YES, it will add the
- "foo-bar" class to the current element (i.e., the dasherized form of
- "fooBar"). If the value is a string, it will add that string as the class.
+ For example, if you pass the string "fooBar", it will first look up the
+ "fooBar" value of the context. If that value is true, it will add the
+ "foo-bar" class to the current element (i.e., the dasherized form of
+ "fooBar"). If the value is a string, it will add that string as the class.
Otherwise, it will not add any new class name.
- @param {Ember.Object} context
+ @param {Ember.Object} context
The context from which to lookup properties
- @param {String} classBindings
+ @param {String} classBindings
A string, space-separated, of class bindings to use
@param {Ember.View} view
The view in which observers should look for the element to update
@param {Srting} bindAttrId
Optional bindAttr id used to lookup elements
@returns {Array} An array of class names to add
*/
-EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId) {
+EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId, options) {
var ret = [], newClass, value, elem;
// Helper method to retrieve the property from the context and
// determine which class string to return, based on whether it is
// a Boolean or not.
@@ -15066,26 +17255,26 @@
var split = property.split(':'),
className = split[1];
property = split[0];
- var val = getPath(context, property);
+ var val = property !== '' ? getPath(context, property, options) : true;
// If value is a Boolean and true, return the dasherized property
// name.
- if (val === YES) {
+ if (val === true) {
if (className) { return className; }
// Normalize property path to be suitable for use
// as a class name. For exaple, content.foo.barBaz
// becomes bar-baz.
var parts = property.split('.');
return Ember.String.dasherize(parts[parts.length-1]);
- // If the value is not NO, undefined, or null, return the current
+ // If the value is not false, undefined, or null, return the current
// value of the property.
- } else if (val !== NO && val !== undefined && val !== null) {
+ } else if (val !== false && val !== undefined && val !== null) {
return val;
// Nothing to display. Return null so that the old class is removed
// but no new class is added.
} else {
@@ -15093,11 +17282,11 @@
}
};
// For each property passed, loop through and setup
// an observer.
- classBindings.split(' ').forEach(function(binding) {
+ forEach(classBindings.split(' '), function(binding) {
// Variable in which the old class value is saved. The observer function
// closes over this variable, so it knows which string to remove when
// the property changes.
var oldClass;
@@ -15108,11 +17297,11 @@
// class name.
/** @private */
observer = function() {
// Get the current value of the property
newClass = classStringForProperty(binding);
- elem = bindAttrId ? view.$("[data-bindAttr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
+ elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
// If we can't find the element anymore, a parent template has been
// re-rendered and we've been nuked. Remove the observer.
if (elem.length === 0) {
Ember.removeObserver(context, binding, invoker);
@@ -15136,102 +17325,123 @@
/** @private */
invoker = function() {
Ember.run.once(observer);
};
- property = binding.split(':')[0];
- Ember.addObserver(context, property, invoker);
+ var property = binding.split(':')[0];
+ if (property !== '') {
+ Ember.addObserver(context, property, invoker);
+ }
- // We've already setup the observer; now we just need to figure out the
+ // We've already setup the observer; now we just need to figure out the
// correct behavior right now on the first pass through.
value = classStringForProperty(binding);
if (value) {
ret.push(value);
- // Make sure we save the current value so that it can be removed if the
+ // Make sure we save the current value so that it can be removed if the
// observer fires.
oldClass = value;
}
});
return ret;
};
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
/*globals Handlebars ember_assert */
// TODO: Don't require the entire module
var get = Ember.get, set = Ember.set;
+var indexOf = Ember.ArrayUtils.indexOf;
var PARENT_VIEW_PATH = /^parentView\./;
+var EmberHandlebars = Ember.Handlebars;
/** @private */
-Ember.Handlebars.ViewHelper = Ember.Object.create({
+EmberHandlebars.ViewHelper = Ember.Object.create({
viewClassFromHTMLOptions: function(viewClass, options, thisContext) {
+ var hash = options.hash, data = options.data;
var extensions = {},
- classes = options['class'],
+ classes = hash['class'],
dup = false;
- if (options.id) {
- extensions.elementId = options.id;
+ if (hash.id) {
+ extensions.elementId = hash.id;
dup = true;
}
if (classes) {
classes = classes.split(' ');
extensions.classNames = classes;
dup = true;
}
- if (options.classBinding) {
- extensions.classNameBindings = options.classBinding.split(' ');
+ if (hash.classBinding) {
+ extensions.classNameBindings = hash.classBinding.split(' ');
dup = true;
}
+ if (hash.classNameBindings) {
+ extensions.classNameBindings = hash.classNameBindings.split(' ');
+ dup = true;
+ }
+
+ if (hash.attributeBindings) {
+ ember_assert("Setting 'attributeBindings' via Handlebars is not allowed. Please subclass Ember.View and set it there instead.");
+ extensions.attributeBindings = null;
+ dup = true;
+ }
+
if (dup) {
- options = jQuery.extend({}, options);
- delete options.id;
- delete options['class'];
- delete options.classBinding;
+ hash = Ember.$.extend({}, hash);
+ delete hash.id;
+ delete hash['class'];
+ delete hash.classBinding;
}
// Look for bindings passed to the helper and, if they are
// local, make them relative to the current context instead of the
// view.
- var path;
+ var path, normalized;
- for (var prop in options) {
- if (!options.hasOwnProperty(prop)) { continue; }
+ for (var prop in hash) {
+ if (!hash.hasOwnProperty(prop)) { continue; }
// Test if the property ends in "Binding"
if (Ember.IS_BINDING.test(prop)) {
- path = options[prop];
- if (!Ember.isGlobalPath(path)) {
+ path = hash[prop];
+
+ normalized = Ember.Handlebars.normalizePath(null, path, data);
+ if (normalized.isKeyword) {
+ hash[prop] = 'templateData.keywords.'+path;
+ } else if (!Ember.isGlobalPath(path)) {
if (path === 'this') {
- options[prop] = 'bindingContext';
+ hash[prop] = 'bindingContext';
} else {
- options[prop] = 'bindingContext.'+path;
+ hash[prop] = 'bindingContext.'+path;
}
}
}
}
// Make the current template context available to the view
// for the bindings set up above.
extensions.bindingContext = thisContext;
- return viewClass.extend(options, extensions);
+ return viewClass.extend(hash, extensions);
},
helper: function(thisContext, path, options) {
var inverse = options.inverse,
data = options.data,
@@ -15239,24 +17449,26 @@
fn = options.fn,
hash = options.hash,
newView;
if ('string' === typeof path) {
- newView = Ember.Handlebars.getPath(thisContext, path);
+ newView = EmberHandlebars.getPath(thisContext, path, options);
ember_assert("Unable to find view at path '" + path + "'", !!newView);
} else {
newView = path;
}
ember_assert(Ember.String.fmt('You must pass a view class to the #view helper, not %@ (%@)', [path, newView]), Ember.View.detect(newView));
- newView = this.viewClassFromHTMLOptions(newView, hash, thisContext);
+ newView = this.viewClassFromHTMLOptions(newView, options, thisContext);
var currentView = data.view;
- var viewOptions = {};
+ var viewOptions = {
+ templateData: options.data
+ };
if (fn) {
- ember_assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !newView.PrototypeMixin.keys().indexOf('templateName') >= 0);
+ ember_assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newView.proto(), 'templateName'));
viewOptions.template = fn;
}
currentView.appendChild(newView, viewOptions);
}
@@ -15266,27 +17478,28 @@
@name Handlebars.helpers.view
@param {String} path
@param {Hash} options
@returns {String} HTML string
*/
-Ember.Handlebars.registerHelper('view', function(path, options) {
+EmberHandlebars.registerHelper('view', function(path, options) {
ember_assert("The view helper only takes a single argument", arguments.length <= 2);
// If no path is provided, treat path param as options.
if (path && path.data && path.data.isRenderData) {
options = path;
path = "Ember.View";
}
- return Ember.Handlebars.ViewHelper.helper(this, path, options);
+ return EmberHandlebars.ViewHelper.helper(this, path, options);
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
@@ -15298,10 +17511,112 @@
/**
@name Handlebars.helpers.collection
@param {String} path
@param {Hash} options
@returns {String} HTML string
+
+ `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
+ `Ember.CollectionView` to a template. See `Ember.CollectionView` for additional
+ information on how a `CollectionView` functions.
+
+ `{{collection}}`'s primary use is as a block helper with a `contentBinding` option
+ pointing towards an `Ember.Array`-compatible object. An `Ember.View` instance will
+ be created for each item in its `content` property. Each view will have its own
+ `content` property set to the appropriate item in the collection.
+
+ The provided block will be applied as the template for each item's view.
+
+ Given an empty `<body>` the following template:
+
+ <script type="text/x-handlebars">
+ {{#collection contentBinding="App.items"}}
+ Hi {{content.name}}
+ {{/collection}}
+ </script>
+
+ And the following application code
+
+ App = Ember.Application.create()
+ App.items = [
+ Ember.Object.create({name: 'Dave'}),
+ Ember.Object.create({name: 'Mary'}),
+ Ember.Object.create({name: 'Sara'})
+ ]
+
+ Will result in the HTML structure below
+
+ <div class="ember-view">
+ <div class="ember-view">Hi Dave</div>
+ <div class="ember-view">Hi Mary</div>
+ <div class="ember-view">Hi Sara</div>
+ </div>
+
+ ### Blockless Use
+ If you provide an `itemViewClass` option that has its own `template` you can omit
+ the block.
+
+ The following template:
+
+ <script type="text/x-handlebars">
+ {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
+ </script>
+
+ And application code
+
+ App = Ember.Application.create()
+ App.items = [
+ Ember.Object.create({name: 'Dave'}),
+ Ember.Object.create({name: 'Mary'}),
+ Ember.Object.create({name: 'Sara'})
+ ]
+
+ App.AnItemView = Ember.View.extend({
+ template: Ember.Handlebars.compile("Greetings {{content.name}}")
+ })
+
+ Will result in the HTML structure below
+
+ <div class="ember-view">
+ <div class="ember-view">Greetings Dave</div>
+ <div class="ember-view">Greetings Mary</div>
+ <div class="ember-view">Greetings Sara</div>
+ </div>
+
+ ### Specifying a CollectionView subclass
+ By default the `{{collection}}` helper will create an instance of `Ember.CollectionView`.
+ You can supply a `Ember.CollectionView` subclass to the helper by passing it
+ as the first argument:
+
+ <script type="text/x-handlebars">
+ {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
+ Hi {{content.name}}
+ {{/collection}}
+ </script>
+
+
+ ### Forwarded `item.*`-named Options
+ As with the `{{view}}`, helper options passed to the `{{collection}}` will be set on
+ the resulting `Ember.CollectionView` as properties. Additionally, options prefixed with
+ `item` will be applied to the views rendered for each item (note the camelcasing):
+
+ <script type="text/x-handlebars">
+ {{#collection contentBinding="App.items"
+ itemTagName="p"
+ itemClassNames="greeting"}}
+ Howdy {{content.name}}
+ {{/collection}}
+ </script>
+
+ Will result in the following HTML structure:
+
+ <div class="ember-view">
+ <p class="ember-view greeting">Howdy Dave</p>
+ <p class="ember-view greeting">Howdy Mary</p>
+ <p class="ember-view greeting">Howdy Sara</p>
+ </div>
+
+
*/
Ember.Handlebars.registerHelper('collection', function(path, options) {
// If no path is provided, treat path param as options.
if (path && path.data && path.data.isRenderData) {
options = path;
@@ -15316,20 +17631,20 @@
var inverse = options.inverse;
// If passed a path string, convert that into an object.
// Otherwise, just default to the standard class.
var collectionClass;
- collectionClass = path ? getPath(this, path) : Ember.CollectionView;
+ collectionClass = path ? getPath(this, path, options) : Ember.CollectionView;
ember_assert(fmt("%@ #collection: Could not find %@", data.view, path), !!collectionClass);
var hash = options.hash, itemHash = {}, match;
// Extract item view class if provided else default to the standard class
var itemViewClass, itemViewPath = hash.itemViewClass;
- var collectionPrototype = get(collectionClass, 'proto');
+ var collectionPrototype = collectionClass.proto();
delete hash.itemViewClass;
- itemViewClass = itemViewPath ? getPath(collectionPrototype, itemViewPath) : collectionPrototype.itemViewClass;
+ itemViewClass = itemViewPath ? getPath(collectionPrototype, itemViewPath, options) : collectionPrototype.itemViewClass;
ember_assert(fmt("%@ #collection: Could not find %@", data.view, itemViewPath), !!itemViewClass);
// Go through options passed to the {{collection}} helper and extract options
// that configure item views instead of the collection itself.
for (var prop in hash) {
@@ -15344,83 +17659,93 @@
delete hash[prop];
}
}
}
- var tagName = hash.tagName || get(collectionClass, 'proto').tagName;
+ var tagName = hash.tagName || collectionPrototype.tagName;
if (fn) {
itemHash.template = fn;
delete options.fn;
}
if (inverse && inverse !== Handlebars.VM.noop) {
- hash.emptyView = Ember.View.extend({
+ var emptyViewClass = Ember.View;
+
+ if (hash.emptyViewClass) {
+ emptyViewClass = Ember.View.detect(hash.emptyViewClass) ?
+ hash.emptyViewClass : getPath(this, hash.emptyViewClass, options);
+ }
+
+ hash.emptyView = emptyViewClass.extend({
template: inverse,
tagName: itemHash.tagName
});
}
if (hash.preserveContext) {
- itemHash.templateContext = Ember.computed(function() {
+ itemHash._templateContext = Ember.computed(function() {
return get(this, 'content');
}).property('content');
delete hash.preserveContext;
}
- hash.itemViewClass = Ember.Handlebars.ViewHelper.viewClassFromHTMLOptions(itemViewClass, itemHash);
+ hash.itemViewClass = Ember.Handlebars.ViewHelper.viewClassFromHTMLOptions(itemViewClass, { data: data, hash: itemHash }, this);
return Ember.Handlebars.helpers.view.call(this, collectionClass, options);
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
/*globals Handlebars */
var getPath = Ember.Handlebars.getPath;
/**
- `unbound` allows you to output a property without binding. *Important:* The
+ `unbound` allows you to output a property without binding. *Important:* The
output will not be updated if the property changes. Use with caution.
<div>{{unbound somePropertyThatDoesntChange}}</div>
@name Handlebars.helpers.unbound
@param {String} property
@returns {String} HTML string
*/
Ember.Handlebars.registerHelper('unbound', function(property, fn) {
var context = (fn.contexts && fn.contexts[0]) || this;
- return getPath(context, property);
+ return getPath(context, property, fn);
});
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-/*globals Handlebars */
+
+/*jshint debug:true*/
var getPath = Ember.getPath;
/**
`log` allows you to output the value of a value in the current rendering
context.
- {{log myVariable}}
+ {{log myVariable}}
@name Handlebars.helpers.log
@param {String} property
*/
Ember.Handlebars.registerHelper('log', function(property, fn) {
@@ -15430,37 +17755,44 @@
/**
The `debugger` helper executes the `debugger` statement in the current
context.
- {{debugger}}
+ {{debugger}}
@name Handlebars.helpers.debugger
@param {String} property
*/
Ember.Handlebars.registerHelper('debugger', function() {
debugger;
});
-})({});
+})();
-(function(exports) {
+
+(function() {
Ember.Handlebars.EachView = Ember.CollectionView.extend(Ember.Metamorph, {
itemViewClass: Ember.View.extend(Ember.Metamorph)
});
Ember.Handlebars.registerHelper('each', function(path, options) {
options.hash.contentBinding = path;
options.hash.preserveContext = true;
+
+ // Set up emptyView as a metamorph with no tag
+ options.hash.itemTagName = '';
+ options.hash.emptyViewClass = Ember.View.extend(Ember.Metamorph);
+
return Ember.Handlebars.helpers.collection.call(this, 'Ember.Handlebars.EachView', options);
});
-})({});
+})();
-(function(exports) {
+
+(function() {
/**
`template` allows you to render a template from inside another template.
This allows you to re-use the same template in multiple places. For example:
<script type="text/x-handlebars">
@@ -15474,11 +17806,11 @@
Name: <em>{{name}}</em>
Karma: <em>{{karma}}</em>
</script>
This helper looks for templates in the global Ember.TEMPLATES hash. If you
- add <script> tags to your page with the `data-template-name` attribute set,
+ add <script> tags to your page with the `data-template-name` attribute set,
they will be compiled and placed in this hash automatically.
You can also manually register templates by adding them to the hash:
Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
@@ -15493,120 +17825,868 @@
ember_assert("Unable to find template with name '"+name+"'.", !!template);
Ember.TEMPLATES[name](this, { data: options.data });
});
-})({});
+})();
-(function(exports) {
-var EmberHandlebars = Ember.Handlebars, getPath = Ember.Handlebars.getPath;
-var ActionHelper = EmberHandlebars.ActionHelper = {};
+(function() {
+var EmberHandlebars = Ember.Handlebars, getPath = EmberHandlebars.getPath;
-ActionHelper.registerAction = function(actionName, eventName, target, view) {
- var actionId = (++jQuery.uuid).toString(),
- existingHandler = view[eventName],
- handler;
+var ActionHelper = EmberHandlebars.ActionHelper = {
+ registeredActions: {}
+};
+/**
+ @name Handlebars.helpers.action
+
+ The `{{action}}` helper registers an HTML element within a template for
+ DOM event handling. User interaction with that element will call the method
+ on the template's associated `Ember.View` instance that has the same name
+ as the first provided argument to `{{action}}`:
- if (existingHandler) {
- var handler = function(event) {
- var ret;
- if ($(event.target).closest('[data-ember-action]').attr('data-ember-action') === actionId) {
- ret = target[actionName](event);
- }
- return ret !== false ? existingHandler.call(view, event) : ret;
- };
- } else {
- var handler = function(event) {
- if ($(event.target).closest('[data-ember-action]').attr('data-ember-action') === actionId) {
- return target[actionName](event);
- }
- };
- }
+ Given the following Handlebars template on the page
- view[eventName] = handler;
+ <script type="text/x-handlebars" data-template-name='a-template'>
+ <div {{action "anActionName"}}>
+ click me
+ </div>
+ </script>
- view.reopen({
- rerender: function() {
- if (existingHandler) {
- view[eventName] = existingHandler;
+ And application code
+
+ AView = Ember.View.extend({
+ templateName; 'a-template',
+ anActionName: function(event){}
+ })
+
+ aView = AView.create()
+ aView.appendTo('body')
+
+ Will results in the following rendered HTML
+
+ <div class="ember-view">
+ <div data-ember-action="1">
+ click me
+ </div>
+ </div>
+
+ Clicking "click me" will trigger the `anActionName` method of the `aView` object with a
+ `jQuery.Event` object as its argument. The `jQuery.Event` object will be extended to include
+ a `view` property that is set to the original view interacted with (in this case the `aView` object).
+
+
+ ### Specifying an Action Target
+ A `target` option can be provided to change which object will receive the method call. This option must be
+ a string representing a path to an object:
+
+ <script type="text/x-handlebars" data-template-name='a-template'>
+ <div {{action "anActionName" target="MyApplication.someObject"}}>
+ click me
+ </div>
+ </script>
+
+ Clicking "click me" in the rendered HTML of the above template will trigger the
+ `anActionName` method of the object at `MyApplication.someObject`. The first argument
+ to this method will be a `jQuery.Event` extended to include a `view` property that is
+ set to the original view interacted with.
+
+ A path relative to the template's `Ember.View` instance can also be used as a target:
+
+ <script type="text/x-handlebars" data-template-name='a-template'>
+ <div {{action "anActionName" target="parentView"}}>
+ click me
+ </div>
+ </script>
+
+ Clicking "click me" in the rendered HTML of the above template will trigger the
+ `anActionName` method of the view's parent view.
+
+ The `{{action}}` helper is `Ember.StateManager` aware. If the target of
+ the action is an `Ember.StateManager` instance `{{action}}` will use the `send`
+ functionality of StateManagers. The documentation for `Ember.StateManager` has additional
+ information about this use.
+
+ If an action's target does not implement a method that matches the supplied action name
+ an error will be thrown.
+
+
+ <script type="text/x-handlebars" data-template-name='a-template'>
+ <div {{action "aMethodNameThatIsMissing"}}>
+ click me
+ </div>
+ </script>
+
+ With the following application code
+
+ AView = Ember.View.extend({
+ templateName; 'a-template',
+ // note: no method 'aMethodNameThatIsMissing'
+ anActionName: function(event){}
+ })
+
+ aView = AView.create()
+ aView.appendTo('body')
+
+ Will throw `Uncaught TypeError: Cannot call method 'call' of undefined` when "click me" is clicked.
+
+
+ ### Specifying DOM event type
+ By default the `{{action}}` helper registers for DOM `click` events. You can supply an
+ `on` option to the helper to specify a different DOM event name:
+
+ <script type="text/x-handlebars" data-template-name='a-template'>
+ <div {{action "aMethodNameThatIsMissing" on="doubleClick"}}>
+ click me
+ </div>
+ </script>
+
+ See `Ember.EventDispatcher` for a list of acceptable DOM event names.
+
+ Because `{{action}}` depends on Ember's event dispatch system it will only function if
+ an `Ember.EventDispatcher` instance is available. An `Ember.EventDispatcher` instance
+ will be created when a new `Ember.Application` is created. Having an instance of
+ `Ember.Application` will satisfy this requirement.
+
+*/
+ActionHelper.registerAction = function(actionName, eventName, target, view, context) {
+ var actionId = (++Ember.$.uuid).toString();
+
+ ActionHelper.registeredActions[actionId] = {
+ eventName: eventName,
+ handler: function(event) {
+ event.view = view;
+ event.context = context;
+
+ // Check for StateManager (or compatible object)
+ if (target.isState && typeof target.send === 'function') {
+ return target.send(actionName, event);
} else {
- view[eventName] = null;
+ return target[actionName].call(target, event);
}
- return this._super();
}
+ };
+
+ view.on('willRerender', function() {
+ delete ActionHelper.registeredActions[actionId];
});
return actionId;
};
EmberHandlebars.registerHelper('action', function(actionName, options) {
var hash = options.hash || {},
- eventName = options.hash.on || "click",
+ eventName = hash.on || "click",
view = options.data.view,
- target;
+ target, context;
if (view.isVirtual) { view = view.get('parentView'); }
- target = options.hash.target ? getPath(this, options.hash.target) : view;
+ target = hash.target ? getPath(this, hash.target, options) : view;
+ context = options.contexts[0];
- var actionId = ActionHelper.registerAction(actionName, eventName, target, view);
+ var actionId = ActionHelper.registerAction(actionName, eventName, target, view, context);
return new EmberHandlebars.SafeString('data-ember-action="' + actionId + '"');
});
-})({});
+})();
-(function(exports) {
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+/**
+ @name Handlebars.helpers.yield
+
+ When used in a Handlebars template that is assigned to an `Ember.View` instance's
+ `layout` property Ember will render the layout template first, inserting the view's
+ own rendered output at the `{{ yield }}` location.
+
+ An empty `<body>` and the following application code:
+
+ AView = Ember.View.extend({
+ classNames: ['a-view-with-layout'],
+ layout: Ember.Handlebars.compile('<div class="wrapper">{{ yield }}</div>'),
+ template: Ember.Handlebars.compile('<span>I am wrapped</span>')
+ })
+
+ aView = AView.create()
+ aView.appendTo('body')
+
+ Will result in the following HTML output:
+
+ <body>
+ <div class='ember-view a-view-with-layout'>
+ <div class="wrapper">
+ <span>I am wrapped</span>
+ </div>
+ </div>
+ </body>
+
+
+ The yield helper cannot be used outside of a template assigned to an `Ember.View`'s `layout` property
+ and will throw an error if attempted.
+
+ BView = Ember.View.extend({
+ classNames: ['a-view-with-layout'],
+ template: Ember.Handlebars.compile('{{yield}}')
+ })
+
+ bView = BView.create()
+ bView.appendTo('body')
+
+ // throws
+ // Uncaught Error: assertion failed: You called yield in a template that was not a layout
+*/
+Ember.Handlebars.registerHelper('yield', function(options) {
+ var view = options.data.view, template;
+
+ while (view && !get(view, 'layout')) {
+ view = get(view, 'parentView');
+ }
+
+ ember_assert("You called yield in a template that was not a layout", !!view);
+
+ template = get(view, 'template');
+
+ if (template) { template(this, options); }
+});
+
+})();
+
+
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+})();
-(function(exports) {
+
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var set = Ember.set, get = Ember.get;
+
+/**
+ @class
+
+ Creates an HTML input view in one of two formats.
+
+ If a `title` property or binding is provided the input will be wrapped in
+ a `div` and `label` tag. View properties like `classNames` will be applied to
+ the outermost `div`. This behavior is deprecated and will issue a warning in development.
+
+
+ {{view Ember.Checkbox classNames="applicaton-specific-checkbox" title="Some title"}}
+
+
+ <div id="ember1" class="ember-view ember-checkbox applicaton-specific-checkbox">
+ <label><input type="checkbox" />Some title</label>
+ </div>
+
+ If `title` isn't provided the view will render as an input element of the 'checkbox' type and HTML
+ related properties will be applied directly to the input.
+
+ {{view Ember.Checkbox classNames="applicaton-specific-checkbox"}}
+
+ <input id="ember1" class="ember-view ember-checkbox applicaton-specific-checkbox" type="checkbox">
+
+ You can add a `label` tag yourself in the template where the Ember.Checkbox is being used.
+
+ <label>
+ Some Title
+ {{view Ember.Checkbox classNames="applicaton-specific-checkbox"}}
+ </label>
+
+
+ The `checked` attribute of an Ember.Checkbox object should always be set
+ through the Ember object or by interacting with its rendered element representation
+ via the mouse, keyboard, or touch. Updating the value of the checkbox via jQuery will
+ result in the checked value of the object and its element losing synchronization.
+
+*/
+Ember.Checkbox = Ember.View.extend({
+ classNames: ['ember-checkbox'],
+
+ tagName: Ember.computed(function(){
+ return get(this, 'title') ? undefined : 'input';
+ }).property(),
+
+ attributeBindings: Ember.computed(function(){
+ return get(this, 'title') ? [] : ['type', 'checked', 'disabled'];
+ }).property(),
+
+ type: "checkbox",
+ checked: false,
+ disabled: false,
+
+ title: Ember.computed(function(propName, value){
+ ember_deprecate("Automatically surrounding Ember.Checkbox inputs with a label by providing a 'title' property is deprecated", value === undefined);
+ return value;
+ }).property().cacheable(),
+
+ defaultTemplate: Ember.computed(function(){
+ if (get(this, 'title')) {
+ return Ember.Handlebars.compile('<label><input type="checkbox" {{bindAttr checked="checked" disabled="disabled"}}>{{title}}</label>');
+ } else {
+ return undefined;
+ }
+ }).property().cacheable(),
+
+ value: Ember.computed(function(propName, value){
+ ember_deprecate("Ember.Checkbox's 'value' property has been renamed to 'checked' to match the html element attribute name");
+ if (value !== undefined) {
+ return set(this, 'checked', value);
+ } else {
+ return get(this, 'checked');
+ }
+ }).property('checked'),
+
+ change: function() {
+ Ember.run.once(this, this._updateElementValue);
+ // returning false will cause IE to not change checkbox state
+ },
+
+ /**
+ @private
+ */
+ _updateElementValue: function() {
+ var input = get(this, 'title') ? this.$('input:checkbox') : this.$();
+ set(this, 'checked', input.prop('checked'));
+ }
+});
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var get = Ember.get, set = Ember.set;
+
+/** @class */
+Ember.TextSupport = Ember.Mixin.create(
+/** @scope Ember.TextSupport.prototype */ {
+
+ value: "",
+
+ attributeBindings: ['placeholder', 'disabled', 'maxlength'],
+ placeholder: null,
+ disabled: false,
+ maxlength: null,
+
+ insertNewline: Ember.K,
+ cancel: Ember.K,
+
+ focusOut: function(event) {
+ this._elementValueDidChange();
+ },
+
+ change: function(event) {
+ this._elementValueDidChange();
+ },
+
+ keyUp: function(event) {
+ this.interpretKeyEvents(event);
+ },
+
+ /**
+ @private
+ */
+ interpretKeyEvents: function(event) {
+ var map = Ember.TextSupport.KEY_EVENTS;
+ var method = map[event.keyCode];
+
+ this._elementValueDidChange();
+ if (method) { return this[method](event); }
+ },
+
+ _elementValueDidChange: function() {
+ set(this, 'value', this.$().val());
+ }
+
+});
+
+Ember.TextSupport.KEY_EVENTS = {
+ 13: 'insertNewline',
+ 27: 'cancel'
+};
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var get = Ember.get, set = Ember.set;
+
+/**
+ @class
+ @extends Ember.TextSupport
+*/
+Ember.TextField = Ember.View.extend(Ember.TextSupport,
+ /** @scope Ember.TextField.prototype */ {
+
+ classNames: ['ember-text-field'],
+
+ tagName: "input",
+ attributeBindings: ['type', 'value', 'size'],
+ type: "text",
+ size: null
+});
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var get = Ember.get, set = Ember.set;
+
+Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
+ classNames: ['ember-button'],
+ classNameBindings: ['isActive'],
+
+ tagName: 'button',
+
+ propagateEvents: false,
+
+ attributeBindings: ['type', 'disabled', 'href'],
+
+ /** @private
+ Overrides TargetActionSupport's targetObject computed
+ property to use Handlebars-specific path resolution.
+ */
+ targetObject: Ember.computed(function() {
+ var target = get(this, 'target'),
+ root = get(this, 'templateContext'),
+ data = get(this, 'templateData');
+
+ if (typeof target !== 'string') { return target; }
+
+ return Ember.Handlebars.getPath(root, target, { data: data });
+ }).property('target').cacheable(),
+
+ // Defaults to 'button' if tagName is 'input' or 'button'
+ type: Ember.computed(function(key, value) {
+ var tagName = this.get('tagName');
+ if (value !== undefined) { this._type = value; }
+ if (this._type !== undefined) { return this._type; }
+ if (tagName === 'input' || tagName === 'button') { return 'button'; }
+ }).property('tagName').cacheable(),
+
+ disabled: false,
+
+ // Allow 'a' tags to act like buttons
+ href: Ember.computed(function() {
+ return this.get('tagName') === 'a' ? '#' : null;
+ }).property('tagName').cacheable(),
+
+ mouseDown: function() {
+ if (!get(this, 'disabled')) {
+ set(this, 'isActive', true);
+ this._mouseDown = true;
+ this._mouseEntered = true;
+ }
+ return get(this, 'propagateEvents');
+ },
+
+ mouseLeave: function() {
+ if (this._mouseDown) {
+ set(this, 'isActive', false);
+ this._mouseEntered = false;
+ }
+ },
+
+ mouseEnter: function() {
+ if (this._mouseDown) {
+ set(this, 'isActive', true);
+ this._mouseEntered = true;
+ }
+ },
+
+ mouseUp: function(event) {
+ if (get(this, 'isActive')) {
+ // Actually invoke the button's target and action.
+ // This method comes from the Ember.TargetActionSupport mixin.
+ this.triggerAction();
+ set(this, 'isActive', false);
+ }
+
+ this._mouseDown = false;
+ this._mouseEntered = false;
+ return get(this, 'propagateEvents');
+ },
+
+ keyDown: function(event) {
+ // Handle space or enter
+ if (event.keyCode === 13 || event.keyCode === 32) {
+ this.mouseDown();
+ }
+ },
+
+ keyUp: function(event) {
+ // Handle space or enter
+ if (event.keyCode === 13 || event.keyCode === 32) {
+ this.mouseUp();
+ }
+ },
+
+ // TODO: Handle proper touch behavior. Including should make inactive when
+ // finger moves more than 20x outside of the edge of the button (vs mouse
+ // which goes inactive as soon as mouse goes out of edges.)
+
+ touchStart: function(touch) {
+ return this.mouseDown(touch);
+ },
+
+ touchEnd: function(touch) {
+ return this.mouseUp(touch);
+ }
+});
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+var get = Ember.get, set = Ember.set;
+
+/**
+ @class
+ @extends Ember.TextSupport
+*/
+Ember.TextArea = Ember.View.extend(Ember.TextSupport,
+/** @scope Ember.TextArea.prototype */ {
+
+ classNames: ['ember-text-area'],
+
+ tagName: "textarea",
+ attributeBindings: ['rows', 'cols'],
+ rows: null,
+ cols: null,
+
+ /**
+ @private
+ */
+ didInsertElement: function() {
+ this._updateElementValue();
+ },
+
+ _updateElementValue: Ember.observer(function() {
+ this.$().val(get(this, 'value'));
+ }, 'value')
+
+});
+
+})();
+
+
+
+(function() {
+Ember.TabContainerView = Ember.View.extend();
+
+})();
+
+
+
+(function() {
+var get = Ember.get, getPath = Ember.getPath;
+
+Ember.TabPaneView = Ember.View.extend({
+ tabsContainer: Ember.computed(function() {
+ return this.nearestInstanceOf(Ember.TabContainerView);
+ }).property(),
+
+ isVisible: Ember.computed(function() {
+ return get(this, 'viewName') === getPath(this, 'tabsContainer.currentView');
+ }).property('tabsContainer.currentView')
+});
+
+})();
+
+
+
+(function() {
+var get = Ember.get, setPath = Ember.setPath;
+
+Ember.TabView = Ember.View.extend({
+ tabsContainer: Ember.computed(function() {
+ return this.nearestInstanceOf(Ember.TabContainerView);
+ }).property(),
+
+ mouseUp: function() {
+ setPath(this, 'tabsContainer.currentView', get(this, 'value'));
+ }
+});
+
+})();
+
+
+
+(function() {
+
+})();
+
+
+
+(function() {
+/*jshint eqeqeq:false */
+
+var set = Ember.set, get = Ember.get, getPath = Ember.getPath;
+var indexOf = Ember.ArrayUtils.indexOf, indexesOf = Ember.ArrayUtils.indexesOf;
+
+Ember.Select = Ember.View.extend({
+ tagName: 'select',
+ template: Ember.Handlebars.compile(
+ '{{#if prompt}}<option>{{prompt}}</option>{{/if}}' +
+ '{{#each content}}{{view Ember.SelectOption contentBinding="this"}}{{/each}}'
+ ),
+ attributeBindings: ['multiple'],
+
+ multiple: false,
+ content: null,
+ selection: null,
+ prompt: null,
+
+ optionLabelPath: 'content',
+ optionValuePath: 'content',
+
+ didInsertElement: function() {
+ var selection = get(this, 'selection');
+
+ if (selection) { this.selectionDidChange(); }
+
+ this.change();
+ },
+
+ change: function() {
+ if (get(this, 'multiple')) {
+ this._changeMultiple();
+ } else {
+ this._changeSingle();
+ }
+ },
+
+ selectionDidChange: Ember.observer(function() {
+ var selection = get(this, 'selection'),
+ isArray = Ember.isArray(selection);
+ if (get(this, 'multiple')) {
+ if (!isArray) {
+ set(this, 'selection', Ember.A([selection]));
+ return;
+ }
+ this._selectionDidChangeMultiple();
+ } else {
+ this._selectionDidChangeSingle();
+ }
+ }, 'selection'),
+
+
+ _changeSingle: function() {
+ var selectedIndex = this.$()[0].selectedIndex,
+ content = get(this, 'content'),
+ prompt = get(this, 'prompt');
+
+ if (!content) { return; }
+ if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
+
+ if (prompt) { selectedIndex -= 1; }
+ set(this, 'selection', content.objectAt(selectedIndex));
+ },
+
+ _changeMultiple: function() {
+ var options = this.$('option:selected'),
+ prompt = get(this, 'prompt'),
+ offset = prompt ? 1 : 0,
+ content = get(this, 'content');
+
+ if (!content){ return; }
+ if (options) {
+ var selectedIndexes = options.map(function(){
+ return this.index - offset;
+ }).toArray();
+ set(this, 'selection', content.objectsAt(selectedIndexes));
+ }
+ },
+
+ _selectionDidChangeSingle: function() {
+ var el = this.$()[0],
+ content = get(this, 'content'),
+ selection = get(this, 'selection'),
+ selectionIndex = indexOf(content, selection),
+ prompt = get(this, 'prompt');
+
+ if (prompt) { selectionIndex += 1; }
+ if (el) { el.selectedIndex = selectionIndex; }
+ },
+
+ _selectionDidChangeMultiple: function() {
+ var content = get(this, 'content'),
+ selection = get(this, 'selection'),
+ selectedIndexes = indexesOf(content, selection),
+ prompt = get(this, 'prompt'),
+ offset = prompt ? 1 : 0,
+ options = this.$('option');
+
+ if (options) {
+ options.each(function() {
+ this.selected = indexOf(selectedIndexes, this.index + offset) > -1;
+ });
+ }
+ }
+
+});
+
+Ember.SelectOption = Ember.View.extend({
+ tagName: 'option',
+ template: Ember.Handlebars.compile("{{label}}"),
+ attributeBindings: ['value', 'selected'],
+
+ init: function() {
+ this.labelPathDidChange();
+ this.valuePathDidChange();
+
+ this._super();
+ },
+
+ selected: Ember.computed(function() {
+ var content = get(this, 'content'),
+ selection = getPath(this, 'parentView.selection');
+ if (getPath(this, 'parentView.multiple')) {
+ return selection && indexOf(selection, content) > -1;
+ } else {
+ // Primitives get passed through bindings as objects... since
+ // `new Number(4) !== 4`, we use `==` below
+ return content == selection;
+ }
+ }).property('content', 'parentView.selection'),
+
+ labelPathDidChange: Ember.observer(function() {
+ var labelPath = getPath(this, 'parentView.optionLabelPath');
+
+ if (!labelPath) { return; }
+
+ Ember.defineProperty(this, 'label', Ember.computed(function() {
+ return getPath(this, labelPath);
+ }).property(labelPath).cacheable());
+ }, 'parentView.optionLabelPath'),
+
+ valuePathDidChange: Ember.observer(function() {
+ var valuePath = getPath(this, 'parentView.optionValuePath');
+
+ if (!valuePath) { return; }
+
+ Ember.defineProperty(this, 'value', Ember.computed(function() {
+ return getPath(this, valuePath);
+ }).property(valuePath).cacheable());
+ }, 'parentView.optionValuePath')
+});
+
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
+
+})();
+
+
+
+(function() {
+// ==========================================================================
+// Project: Ember Handlebar Views
+// Copyright: ©2011 Strobe Inc. and contributors.
+// License: Licensed under MIT license (see license.js)
+// ==========================================================================
/*globals Handlebars */
// Find templates stored in the head tag as script tags and make them available
// to Ember.CoreView in the global Ember.TEMPLATES object. This will be run as as
// jQuery DOM-ready callback.
//
-// Script tags with type="text/html" or "text/x-handlebars" will be compiled
+// Script tags with "text/x-handlebars" will be compiled
// with Ember's Handlebars and are suitable for use as a view's template.
// Those with type="text/x-raw-handlebars" will be compiled with regular
// Handlebars and are suitable for use in views' computed properties.
Ember.Handlebars.bootstrap = function(ctx) {
- Ember.$('script[type="text/html"], script[type="text/x-handlebars"], script[type="text/x-raw-handlebars"]', ctx)
+ var selectors = 'script[type="text/x-handlebars"], script[type="text/x-raw-handlebars"]';
+
+ if (Ember.ENV.LEGACY_HANDLEBARS_TAGS) { selectors += ', script[type="text/html"]'; }
+
+ ember_warn("Ember no longer parses text/html script tags by default. Set ENV.LEGACY_HANDLEBARS_TAGS = true to restore this functionality.", Ember.ENV.LEGACY_HANDLEBARS_TAGS || Ember.$('script[type="text/html"]').length === 0);
+
+ Ember.$(selectors, ctx)
.each(function() {
// Get a reference to the script tag
var script = Ember.$(this),
- compile = (script.attr('type') === 'text/x-raw-handlebars') ?
+ type = script.attr('type');
+
+ if (type === 'text/html' && !Ember.ENV.LEGACY_HANDLEBARS_TAGS) { return; }
+
+ var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
Ember.$.proxy(Handlebars.compile, Handlebars) :
Ember.$.proxy(Ember.Handlebars.compile, Ember.Handlebars),
// Get the name of the script, used by Ember.View's templateName property.
// First look for data-template-name attribute, then fall back to its
// id if no name is found.
templateName = script.attr('data-template-name') || script.attr('id'),
template = compile(script.html()),
- view, viewPath, tagName;
+ view, viewPath, elementId, tagName, options;
if (templateName) {
// For templates which have a name, we save them and then remove them from the DOM
Ember.TEMPLATES[templateName] = template;
// Remove script tag from DOM
script.remove();
} else {
if (script.parents('head').length !== 0) {
// don't allow inline templates in the head
- throw new Ember.Error("Template found in \<head\> without a name specified. " +
+ throw new Ember.Error("Template found in <head> without a name specified. " +
"Please provide a data-template-name attribute.\n" +
script.html());
}
// For templates which will be evaluated inline in the HTML document, instantiates a new
@@ -15616,19 +18696,24 @@
// Users can optionally specify a custom view subclass to use by setting the
// data-view attribute of the script tag.
viewPath = script.attr('data-view');
view = viewPath ? Ember.getPath(viewPath) : Ember.View;
+ // Get the id of the script, used by Ember.View's elementId property,
+ // Look for data-element-id attribute.
+ elementId = script.attr('data-element-id');
+
// Users can optionally specify a custom tag name to use by setting the
// data-tag-name attribute on the script tag.
tagName = script.attr('data-tag-name');
- view = view.create({
- template: template,
- tagName: (tagName) ? tagName : undefined
- });
+ options = { template: template };
+ if (elementId) { options.elementId = elementId; }
+ if (tagName) { options.tagName = tagName; }
+ view = view.create(options);
+
view._insertElementLater(function() {
script.replaceWith(this.$());
// Avoid memory leak in IE
script = null;
@@ -15641,24 +18726,27 @@
function(){
Ember.Handlebars.bootstrap( Ember.$(document) );
}
);
-})({});
+})();
-(function(exports) {
+
+(function() {
// ==========================================================================
// Project: Ember Handlebar Views
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+})();
-(function(exports) {
+(function() {
// ==========================================================================
-// Project: Ember Handlebar Views
+// Project: Ember
// Copyright: ©2011 Strobe Inc. and contributors.
// License: Licensed under MIT license (see license.js)
// ==========================================================================
-})({});
+
+})();
+