ember-source 1.4.0.beta.4 → 1.4.0.beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/dist/ember.js CHANGED
@@ -5,7 +5,7 @@
5
5
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
6
6
  * @license Licensed under MIT license
7
7
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
8
- * @version 1.4.0-beta.4+pre.88c597fa
8
+ * @version 1.4.0-beta.5
9
9
  */
10
10
 
11
11
 
@@ -180,10 +180,21 @@ Ember.deprecateFunc = function(message, func) {
180
180
 
181
181
  // Inform the developer about the Ember Inspector if not installed.
182
182
  if (!Ember.testing) {
183
- if (typeof window !== 'undefined' && window.chrome && window.addEventListener) {
183
+ var isFirefox = typeof InstallTrigger !== 'undefined';
184
+ var isChrome = !!window.chrome && !window.opera;
185
+
186
+ if (typeof window !== 'undefined' && (isFirefox || isChrome) && window.addEventListener) {
184
187
  window.addEventListener("load", function() {
185
188
  if (document.body && document.body.dataset && !document.body.dataset.emberExtension) {
186
- Ember.debug('For more advanced debugging, install the Ember Inspector from https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi');
189
+ var downloadURL;
190
+
191
+ if(isChrome) {
192
+ downloadURL = 'https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi';
193
+ } else if(isFirefox) {
194
+ downloadURL = 'https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/'
195
+ }
196
+
197
+ Ember.debug('For more advanced debugging, install the Ember Inspector from ' + downloadURL);
187
198
  }
188
199
  }, false);
189
200
  }
@@ -198,7 +209,7 @@ if (!Ember.testing) {
198
209
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
199
210
  * @license Licensed under MIT license
200
211
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
201
- * @version 1.4.0-beta.4
212
+ * @version 1.4.0-beta.5
202
213
  */
203
214
 
204
215
 
@@ -281,7 +292,7 @@ var define, requireModule, require, requirejs;
281
292
 
282
293
  @class Ember
283
294
  @static
284
- @version 1.4.0-beta.4+pre.88c597fa
295
+ @version 1.4.0-beta.5
285
296
  */
286
297
 
287
298
  if ('undefined' === typeof Ember) {
@@ -308,10 +319,10 @@ Ember.toString = function() { return "Ember"; };
308
319
  /**
309
320
  @property VERSION
310
321
  @type String
311
- @default '1.4.0-beta.4+pre.88c597fa'
322
+ @default '1.4.0-beta.5'
312
323
  @static
313
324
  */
314
- Ember.VERSION = '1.4.0-beta.4+pre.88c597fa';
325
+ Ember.VERSION = '1.4.0-beta.5';
315
326
 
316
327
  /**
317
328
  Standard environmental variables. You can define these in a global `EmberENV`
@@ -20825,7 +20836,7 @@ var get = Ember.get, set = Ember.set, forEach = Ember.EnumerableUtils.forEach,
20825
20836
  ```
20826
20837
 
20827
20838
  The itemController instances will have a `parentController` property set to
20828
- to the `ArrayController` instance.
20839
+ the `ArrayController` instance.
20829
20840
 
20830
20841
  @class ArrayController
20831
20842
  @namespace Ember
@@ -21276,7 +21287,7 @@ function escapeAttribute(value) {
21276
21287
  return string.replace(BAD_CHARS_REGEXP, escapeChar);
21277
21288
  }
21278
21289
 
21279
- // IE 6/7 have bugs arond setting names on inputs during creation.
21290
+ // IE 6/7 have bugs around setting names on inputs during creation.
21280
21291
  // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
21281
21292
  // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
21282
21293
  var canSetNameOnInputs = (function() {
@@ -21454,7 +21465,11 @@ Ember._RenderBuffer.prototype = {
21454
21465
  },
21455
21466
 
21456
21467
  setClasses: function(classNames) {
21457
- this.classes = classNames;
21468
+ this.elementClasses = null;
21469
+ var len = classNames.length, i;
21470
+ for (i = 0; i < len; i++) {
21471
+ this.addClass(classNames[i]);
21472
+ }
21458
21473
  },
21459
21474
 
21460
21475
  /**
@@ -21508,7 +21523,7 @@ Ember._RenderBuffer.prototype = {
21508
21523
  },
21509
21524
 
21510
21525
  /**
21511
- Adds an property which will be rendered to the element.
21526
+ Adds a property which will be rendered to the element.
21512
21527
 
21513
21528
  @method prop
21514
21529
  @param {String} name The name of the property
@@ -21588,6 +21603,7 @@ Ember._RenderBuffer.prototype = {
21588
21603
  if (classes) {
21589
21604
  buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
21590
21605
  this.classes = null;
21606
+ this.elementClasses = null;
21591
21607
  }
21592
21608
 
21593
21609
  if (style) {
@@ -21670,6 +21686,7 @@ Ember._RenderBuffer.prototype = {
21670
21686
  if (classes) {
21671
21687
  $element.attr('class', classes.join(' '));
21672
21688
  this.classes = null;
21689
+ this.elementClasses = null;
21673
21690
  }
21674
21691
 
21675
21692
  if (style) {
@@ -37721,6 +37738,10 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
37721
37738
  target = target.root;
37722
37739
  }
37723
37740
 
37741
+ if (options.boundProperty) {
37742
+ Ember.deprecate("Using a quoteless parameter with {{action}} is deprecated. Please update to quoted usage '{{action \"" + actionName + "\"}}.", false);
37743
+ }
37744
+
37724
37745
  Ember.run(function runRegisteredAction() {
37725
37746
  if (target.send) {
37726
37747
  target.send.apply(target, args(options.parameters, actionName));
@@ -37939,6 +37960,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
37939
37960
  action.target = { root: root, target: target, options: options };
37940
37961
  action.bubbles = hash.bubbles;
37941
37962
  action.preventDefault = hash.preventDefault;
37963
+ action.boundProperty = options.types[0] === "ID";
37942
37964
 
37943
37965
  var actionId = ActionHelper.registerAction(actionName, action, hash.allowedKeys);
37944
37966
  return new SafeString('data-ember-action="' + actionId + '"');
@@ -39935,6 +39957,8 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin
39935
39957
 
39936
39958
  willDestroy: function() {
39937
39959
  Ember.BOOTED = false;
39960
+ // Ensure deactivation of routes before objects are destroyed
39961
+ this.__container__.lookup('router:main').reset();
39938
39962
 
39939
39963
  this.__container__.destroy();
39940
39964
  },