Permalink
Browse files

Updates ember vendor assets.

  • Loading branch information...
1 parent 0e02f9d commit 0b86f377c80a7ce6c60fb18525a741bfb1d06c1f @michaeldupuisjr michaeldupuisjr committed Jun 20, 2013
Showing with 20 additions and 15 deletions.
  1. +8 −6 vendor/assets/javascripts/ember-data.js
  2. +12 −9 vendor/assets/javascripts/ember.js
@@ -1,5 +1,7 @@
+// Last commit: 3981a7c (2013-05-28 05:00:14 -0700)
-n() {
+
+(function() {
var define, requireModule;
(function() {
@@ -113,7 +115,7 @@ Ember.onLoad('Ember.Application', function(Application) {
(function() {
/**
* Date.parse with progressive enhancement for ISO 8601 <https://github.com/csnover/js-iso8601>
- * © 2011 Colin Snover <http://zetafleet.com>
+ * © 2011 Colin Snover <http://zetafleet.com>
* Released under MIT license.
*/
@@ -123,12 +125,12 @@ var origParse = Date.parse, numericKeys = [ 1, 4, 5, 6, 7, 10, 11 ];
Ember.Date.parse = function (date) {
var timestamp, struct, minutesOffset = 0;
- // ES5 §15.9.4.2 states that the string should attempt to be parsed as a Date Time String Format string
- // before falling back to any implementation-specific date parsing, so that’s what we do, even if native
+ // ES5 §15.9.4.2 states that the string should attempt to be parsed as a Date Time String Format string
+ // before falling back to any implementation-specific date parsing, so that’s what we do, even if native
// implementations could be faster
- // 1 YYYY 2 MM 3 DD 4 HH 5 mm 6 ss 7 msec 8 Z 9 ± 10 tzHH 11 tzmm
+ // 1 YYYY 2 MM 3 DD 4 HH 5 mm 6 ss 7 msec 8 Z 9 ± 10 tzHH 11 tzmm
if ((struct = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/.exec(date))) {
- // avoid NaN timestamps caused by “undefined” values being passed to Date.UTC
+ // avoid NaN timestamps caused by “undefined” values being passed to Date.UTC
for (var i = 0, k; (k = numericKeys[i]); ++i) {
struct[k] = +struct[k] || 0;
}
@@ -1,5 +1,8 @@
+// Version: v1.0.0-rc.3-272-g4c74b2d
+// Last commit: 4c74b2d (2013-05-21 12:35:21 -0700)
-n() {
+
+(function() {
/*global __fail__*/
/**
@@ -1417,10 +1420,10 @@ var populateListeners = function(name) {
};
var time = (function() {
- var perf = 'undefined' !== typeof window ? window.performance || {} : {};
- var fn = perf.now || perf.mozNow || perf.webkitNow || perf.msNow || perf.oNow;
- // fn.bind will be available in all the browsers that support the advanced window.performance... ;-)
- return fn ? fn.bind(perf) : function() { return +new Date(); };
+ var perf = 'undefined' !== typeof window ? window.performance || {} : {};
+ var fn = perf.now || perf.mozNow || perf.webkitNow || perf.msNow || perf.oNow;
+ // fn.bind will be available in all the browsers that support the advanced window.performance... ;-)
+ return fn ? fn.bind(perf) : function() { return +new Date(); };
})();
@@ -9268,7 +9271,7 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
This returns the objects at the specified indexes, using `objectAt`.
```javascript
- var arr =Â ['a', 'b', 'c', 'd'];
+ var arr = ['a', 'b', 'c', 'd'];
arr.objectsAt([0, 1, 2]); // ["a", "b", "c"]
arr.objectsAt([2, 3, 4]); // ["c", "d", undefined]
```
@@ -18539,7 +18542,7 @@ define("metamorph",
"use strict";
// ==========================================================================
// Project: metamorph
- // Copyright: ©2011 My Company Inc. All rights reserved.
+ // Copyright: ©2011 My Company Inc. All rights reserved.
// ==========================================================================
var K = function(){},
@@ -19013,7 +19016,7 @@ if(!Handlebars && typeof require === 'function') {
}
Ember.assert("Ember Handlebars requires Handlebars version 1.0.0-rc.4. Include a SCRIPT tag in the HTML HEAD linking to the Handlebars file before you link to Ember.", Handlebars)
-Ember.assert("Ember Handlebars requires Handlebars version 1.0.0-rc.4, COMPILER_REVISION expected: 3, got: " + Handlebars.COMPILER_REVISION + " – Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 3);
+Ember.assert("Ember Handlebars requires Handlebars version 1.0.0-rc.4, COMPILER_REVISION expected: 3, got: " + Handlebars.COMPILER_REVISION + " Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 3);
/**
Prepares the Handlebars templating library for use inside Ember's view
@@ -20565,7 +20568,7 @@ EmberHandlebars.registerHelper('unless', function(context, options) {
```
All three strategies - string return value, boolean return value, and
- hard-coded value – can be combined in a single declaration:
+ hard-coded value can be combined in a single declaration:
```handlebars
<img {{bindAttr class=":class-name-to-always-apply view.someBool:class-name-if-true view.someProperty"}}>

0 comments on commit 0b86f37

Please sign in to comment.