ember-source 1.9.0.beta.4 → 1.9.0

data/dist/ember-tests.prod.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.9.0-beta.4
+ * @version   1.9.0
  */
 
 (function() {
@@ -14,6 +14,7 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
 (function() {
   Ember = this.Ember = this.Ember || {};
   if (typeof Ember === 'undefined') { Ember = {}; };
+  function UNDEFINED() { }
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
@@ -23,7 +24,11 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
     };
 
     requirejs = eriuqer = requireModule = function(name) {
-      if (seen.hasOwnProperty(name)) { return seen[name]; }
+      var s = seen[name];
+
+      if (s !== undefined) { return seen[name]; }
+      if (s === UNDEFINED) { return undefined;  }
+
       seen[name] = {};
 
       if (!registry[name]) {
@@ -35,34 +40,37 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
       var callback = mod.callback;
       var reified = [];
       var exports;
+      var length = deps.length;
 
-      for (var i=0, l=deps.length; i<l; i++) {
+      for (var i=0; i<length; i++) {
         if (deps[i] === 'exports') {
           reified.push(exports = {});
         } else {
-          reified.push(requireModule(resolve(deps[i])));
+          reified.push(requireModule(resolve(deps[i], name)));
         }
       }
 
-      var value = callback.apply(this, reified);
-      return seen[name] = exports || value;
+      var value = length === 0 ? callback.call(this) : callback.apply(this, reified);
 
-      function resolve(child) {
-        if (child.charAt(0) !== '.') { return child; }
-        var parts = child.split("/");
-        var parentBase = name.split("/").slice(0, -1);
+      return seen[name] = exports || (value === undefined ? UNDEFINED : value);
+    };
 
-        for (var i=0, l=parts.length; i<l; i++) {
-          var part = parts[i];
+    function resolve(child, name) {
+      if (child.charAt(0) !== '.') { return child; }
+      var parts = child.split("/");
+      var parentBase = name.split("/").slice(0, -1);
 
-          if (part === '..') { parentBase.pop(); }
-          else if (part === '.') { continue; }
-          else { parentBase.push(part); }
-        }
+      for (var i=0, l=parts.length; i<l; i++) {
+        var part = parts[i];
 
-        return parentBase.join("/");
+        if (part === '..') { parentBase.pop(); }
+        else if (part === '.') { continue; }
+        else { parentBase.push(part); }
       }
-    };
+
+      return parentBase.join("/");
+    }
+
     requirejs._eak_seen = registry;
 
     Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
@@ -7222,6 +7230,14 @@ enifed("ember-handlebars/tests/handlebars_test",
       ok(safeString instanceof Handlebars.SafeString, "should return SafeString");
     });
 
+    test("htmlSafe should return an empty string for null", function() {
+      equal(htmlSafe(null).toString(), "", "should return an empty string");
+    });
+
+    test("htmlSafe should return an empty string for undefined", function() {
+      equal(htmlSafe().toString(), "", "should return an empty string");
+    });
+
     test("should escape HTML in normal mustaches", function() {
       view = EmberView.create({
         template: EmberHandlebars.compile('{{view.output}}'),
@@ -27781,6 +27797,31 @@ enifed("ember-routing/tests/system/route_test",
       equal(route.modelFor('foo'), foo);
     });
 
+
+    test(".send just calls an action if the router is absent", function() {
+      expect(7);
+      var route = Ember.Route.createWithMixins({
+        actions: {
+          returnsTrue: function(foo, bar) {
+            equal(foo, 1);
+            equal(bar, 2);
+            equal(this, route);
+            return true;
+          },
+
+          returnsFalse: function() {
+            ok(true, "returnsFalse was called");
+            return false;
+          }
+        }
+      });
+
+      equal(true, route.send('returnsTrue', 1, 2));
+      equal(false, route.send('returnsFalse'));
+      equal(undefined, route.send('nonexistent', 1, 2, 3));
+    });
+
+
     QUnit.module("Ember.Route serialize", {
       setup: createRoute,
       teardown: cleanupRoute
@@ -47989,6 +48030,27 @@ enifed("ember-views/tests/system/view_utils_test",
     var run = __dependency1__["default"];
     var View = __dependency2__["default"];
 
+    var hasGetClientRects, hasGetBoundingClientRect;
+    var ClientRectListCtor, ClientRectCtor;
+
+    (function() {
+      if (document.createRange) {
+        var range = document.createRange();
+
+        if (range.getClientRects) {
+          var clientRectsList = range.getClientRects();
+          hasGetClientRects = true;
+          ClientRectListCtor = clientRectsList && clientRectsList.constructor;
+        }
+
+        if (range.getBoundingClientRect) {
+          var clientRect = range.getBoundingClientRect();
+          hasGetBoundingClientRect = true;
+          ClientRectCtor = clientRect && clientRect.constructor;
+        }
+      }
+    })();
+
     var view;
 
     QUnit.module("ViewUtils", {
@@ -47999,9 +48061,10 @@ enifed("ember-views/tests/system/view_utils_test",
       }
     });
 
+
     test("getViewClientRects", function() {
-      if (!(window.Range && window.Range.prototype.getClientRects)) {
-        ok(true, "The test environment does not support the DOM API required for getViewClientRects.");
+      if (!hasGetClientRects || !ClientRectListCtor) {
+        ok(true, "The test environment does not support the DOM API required to run this test.");
         return;
       }
 
@@ -48013,12 +48076,12 @@ enifed("ember-views/tests/system/view_utils_test",
 
       run(function() { view.appendTo('#qunit-fixture'); });
 
-      ok(Ember.ViewUtils.getViewClientRects(view) instanceof window.ClientRectList);
+      ok(Ember.ViewUtils.getViewClientRects(view) instanceof ClientRectListCtor);
     });
 
     test("getViewBoundingClientRect", function() {
-      if (!(window.Range && window.Range.prototype.getBoundingClientRect)) {
-        ok(true, "The test environment does not support the DOM API required for getViewBoundingClientRect.");
+      if (!hasGetBoundingClientRect || !ClientRectCtor) {
+        ok(true, "The test environment does not support the DOM API required to run this test.");
         return;
       }
 
@@ -48030,7 +48093,7 @@ enifed("ember-views/tests/system/view_utils_test",
 
       run(function() { view.appendTo('#qunit-fixture'); });
 
-      ok(Ember.ViewUtils.getViewBoundingClientRect(view) instanceof window.ClientRect);
+      ok(Ember.ViewUtils.getViewBoundingClientRect(view) instanceof ClientRectCtor);
     });
   });
 enifed("ember-views/tests/system/view_utils_test.jshint",
@@ -59826,6 +59889,79 @@ enifed("ember/tests/routing/basic_test",
       Ember.run(router, 'transitionTo', 'out');
       deepEqual(calls, [['reset', 'c'], ['reset', 'a'], ['setup', 'out']]);
     });
+
+    test("Exception during initialization of non-initial route is not swallowed", function() {
+      Router.map(function() {
+        this.route('boom');
+      });
+      App.BoomRoute = Ember.Route.extend({
+        init: function() {
+          throw new Error("boom!");
+        }
+      });
+      bootApplication();
+      throws(function(){
+        Ember.run(router, 'transitionTo', 'boom');
+      }, /\bboom\b/);
+    });
+
+
+    test("Exception during load of non-initial route is not swallowed", function() {
+      Router.map(function() {
+        this.route('boom');
+      });
+      var lookup = container.lookup;
+      container.lookup = function() {
+        if (arguments[0] === 'route:boom') {
+          throw new Error("boom!");
+        }
+        return lookup.apply(this, arguments);
+      };
+      App.BoomRoute = Ember.Route.extend({
+        init: function() {
+          throw new Error("boom!");
+        }
+      });
+      bootApplication();
+      throws(function(){
+        Ember.run(router, 'transitionTo', 'boom');
+      });
+    });
+
+    test("Exception during initialization of initial route is not swallowed", function() {
+      Router.map(function() {
+        this.route('boom', {path: '/'});
+      });
+      App.BoomRoute = Ember.Route.extend({
+        init: function() {
+          throw new Error("boom!");
+        }
+      });
+      throws(function(){
+        bootApplication();
+      }, /\bboom\b/);
+    });
+
+    test("Exception during load of initial route is not swallowed", function() {
+      Router.map(function() {
+        this.route('boom', {path: '/'});
+      });
+      var lookup = container.lookup;
+      container.lookup = function() {
+        if (arguments[0] === 'route:boom') {
+          throw new Error("boom!");
+        }
+        return lookup.apply(this, arguments);
+      };
+      App.BoomRoute = Ember.Route.extend({
+        init: function() {
+          throw new Error("boom!");
+        }
+      });
+      throws(function(){
+        bootApplication();
+      }, /\bboom\b/);
+    });
   });
 enifed("ember/tests/routing/basic_test.jshint",
   [],

data/dist/ember.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.9.0-beta.4
+ * @version   1.9.0
  */
 
 (function() {
@@ -14,6 +14,7 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
 (function() {
   Ember = this.Ember = this.Ember || {};
   if (typeof Ember === 'undefined') { Ember = {}; };
+  function UNDEFINED() { }
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
@@ -23,7 +24,11 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
     };
 
     requirejs = eriuqer = requireModule = function(name) {
-      if (seen.hasOwnProperty(name)) { return seen[name]; }
+      var s = seen[name];
+
+      if (s !== undefined) { return seen[name]; }
+      if (s === UNDEFINED) { return undefined;  }
+
       seen[name] = {};
 
       if (!registry[name]) {
@@ -35,34 +40,37 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
       var callback = mod.callback;
       var reified = [];
       var exports;
+      var length = deps.length;
 
-      for (var i=0, l=deps.length; i<l; i++) {
+      for (var i=0; i<length; i++) {
         if (deps[i] === 'exports') {
           reified.push(exports = {});
         } else {
-          reified.push(requireModule(resolve(deps[i])));
+          reified.push(requireModule(resolve(deps[i], name)));
         }
       }
 
-      var value = callback.apply(this, reified);
-      return seen[name] = exports || value;
+      var value = length === 0 ? callback.call(this) : callback.apply(this, reified);
 
-      function resolve(child) {
-        if (child.charAt(0) !== '.') { return child; }
-        var parts = child.split("/");
-        var parentBase = name.split("/").slice(0, -1);
+      return seen[name] = exports || (value === undefined ? UNDEFINED : value);
+    };
 
-        for (var i=0, l=parts.length; i<l; i++) {
-          var part = parts[i];
+    function resolve(child, name) {
+      if (child.charAt(0) !== '.') { return child; }
+      var parts = child.split("/");
+      var parentBase = name.split("/").slice(0, -1);
 
-          if (part === '..') { parentBase.pop(); }
-          else if (part === '.') { continue; }
-          else { parentBase.push(part); }
-        }
+      for (var i=0, l=parts.length; i<l; i++) {
+        var part = parts[i];
 
-        return parentBase.join("/");
+        if (part === '..') { parentBase.pop(); }
+        else if (part === '.') { continue; }
+        else { parentBase.push(part); }
       }
-    };
+
+      return parentBase.join("/");
+    }
+
     requirejs._eak_seen = registry;
 
     Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
@@ -9610,6 +9618,10 @@ enifed("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
+      if (str === null || str === undefined) {
+        return "";
+      }
+
       if (typeof str !== 'string') {
         str = ''+str;
       }
@@ -13122,7 +13134,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.9.0-beta.4
+      @version 1.9.0
     */
 
     if ('undefined' === typeof Ember) {
@@ -13149,10 +13161,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.9.0-beta.4'
+      @default '1.9.0'
       @static
     */
-    Ember.VERSION = '1.9.0-beta.4';
+    Ember.VERSION = '1.9.0';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -17926,34 +17938,40 @@ enifed("ember-metal/run_loop",
     };
 
     /**
-      Provides a useful utility for when integrating with non-Ember libraries
-      that provide asynchronous callbacks.
-
-      Ember utilizes a run-loop to batch and coalesce changes. This works by
-      marking the start and end of Ember-related Javascript execution.
+      Allows you to specify which context to call the specified function in while
+      adding the execution of that function to the Ember run loop. This ability
+      makes this method a great way to asynchronusly integrate third-party libraries
+      into your Ember application.
 
-      When using events such as a View's click handler, Ember wraps the event
-      handler in a run-loop, but when integrating with non-Ember libraries this
-      can be tedious.
+      `run.bind` takes two main arguments, the desired context and the function to
+      invoke in that context. Any additional arguments will be supplied as arguments
+      to the function that is passed in.
 
-      For example, the following is rather verbose but is the correct way to combine
-      third-party events and Ember code.
+      Let's use the creation of a TinyMCE component as an example. Currently,
+      TinyMCE provides a setup configuration option we can use to do some processing
+      after the TinyMCE instance is initialized but before it is actually rendered.
+      We can use that setup option to do some additional setup for our component.
+      The component itself could look something like the following:
 
       ```javascript
-      var that = this;
-      jQuery(window).on('resize', function(){
-        run(function(){
-          that.handleResize();
-        });
+      App.RichTextEditorComponent = Ember.Component.extend({
+        initializeTinyMCE: function(){
+          tinymce.init({
+            selector: '#' + this.$().prop('id'),
+            setup: Ember.run.bind(this, this.setupEditor)
+          });
+        }.on('didInsertElement'),
+
+        setupEditor: function(editor) {
+          this.set('editor', editor);
+          editor.on('change', function(){ console.log('content changed!')} );
+        }
       });
       ```
 
-      To reduce the boilerplate, the following can be used to construct a
-      run-loop-wrapped callback handler.
-
-      ```javascript
-      jQuery(window).on('resize', run.bind(this, this.handleResize));
-      ```
+      In this example, we use Ember.run.bind to bind the setupEditor message to the
+      context of the App.RichTextEditorComponent and to have the invocation of that
+      method be safely handled and excuted by the Ember run loop.
 
       @method bind
       @namespace Ember
@@ -17966,7 +17984,7 @@ enifed("ember-metal/run_loop",
       when called within an existing loop, no return value is possible.
       @since 1.4.0
     */
-    run.bind = function(target, method /* args*/) {
+    run.bind = function(target, method /* args */) {
       var args = slice.call(arguments);
       return function() {
         return run.join.apply(run, args.concat(slice.call(arguments)));
@@ -23552,6 +23570,8 @@ enifed("ember-routing/system/route",
     var generateController = __dependency18__["default"];
     var stashParamNames = __dependency19__.stashParamNames;
 
+    var slice = Array.prototype.slice;
+
     /**
     @module ember
     @submodule ember-routing
@@ -24514,7 +24534,16 @@ enifed("ember-routing/system/route",
         @param {...*} args
       */
       send: function() {
-        return this.router.send.apply(this.router, arguments);
+        if (this.router || !Ember.testing) {
+          this.router.send.apply(this.router, arguments);
+        } else {
+          var name = arguments[0];
+          var args = slice.call(arguments, 1);
+          var action = this._actions[name];
+          if (action) {
+            return this._actions[name].apply(this, args);
+          }
+        }
       },
 
       /**
@@ -25678,6 +25707,7 @@ enifed("ember-routing/system/router",
         var container = this.container;
         var self = this;
         var initialURL = get(this, 'initialURL');
+        var initialTransition;
 
         // Allow the Location class to cancel the router setup while it refreshes
         // the page
@@ -25697,8 +25727,10 @@ enifed("ember-routing/system/router",
         if (typeof initialURL === "undefined") {
           initialURL = location.getURL();
         }
-
-        this.handleURL(initialURL);
+        initialTransition = this.handleURL(initialURL);
+        if (initialTransition && initialTransition.error) {
+          throw initialTransition.error;
+        }
       },
 
       /**
@@ -47052,6 +47084,7 @@ enifed("router/transition",
 
       if (error) {
         this.promise = Promise.reject(error);
+        this.error = error;
         return;
       }