dist/ember.js in ember-source-1.7.0 vs dist/ember.js in ember-source-1.7.1
- old
+ new
@@ -3,11 +3,11 @@
* @copyright Copyright 2011-2014 Tilde Inc. and contributors
* Portions Copyright 2006-2011 Strobe Inc.
* 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.7.0
+ * @version 1.7.1
*/
(function() {
var define, requireModule, require, requirejs, Ember;
@@ -5220,18 +5220,20 @@
var hash = options.hash,
types = options.hashTypes,
inputType = _resolveOption(this, options, 'type'),
onEvent = hash.on;
- delete hash.type;
- delete hash.on;
-
if (inputType === 'checkbox') {
+ delete hash.type;
+ delete types.type;
+
Ember.assert("{{input type='checkbox'}} does not support setting `value=someBooleanValue`; you must use `checked=someBooleanValue` instead.", options.hashTypes.value !== 'ID');
+
return helpers.view.call(this, Checkbox, options);
} else {
- if (inputType) { hash.type = inputType; }
+ delete hash.on;
+
hash.onEvent = onEvent || 'enter';
return helpers.view.call(this, TextField, options);
}
}
@@ -12999,11 +13001,11 @@
The core Runtime framework is based on the jQuery API with a number of
performance optimizations.
@class Ember
@static
- @version 1.7.0
+ @version 1.7.1
*/
if ('undefined' === typeof Ember) {
// Create core object. Make it act like an instance of Ember.Namespace so that
// objects assigned to it are given a sane string representation.
@@ -13026,14 +13028,14 @@
/**
@property VERSION
@type String
- @default '1.7.0'
+ @default '1.7.1'
@static
*/
- Ember.VERSION = '1.7.0';
+ Ember.VERSION = '1.7.1';
/**
Standard environmental variables. You can define these in a global `EmberENV`
variable before loading Ember to control various configuration settings.
@@ -16362,12 +16364,12 @@
if (platform.hasPropertyAccessors) {
defineProperty(object, deprecatedKey, {
configurable: true,
enumerable: false,
- set: function(value) { deprecate(); set(object, newKey, value); },
- get: function() { deprecate(); return get(object, newKey); }
+ set: function(value) { deprecate(); set(this, newKey, value); },
+ get: function() { deprecate(); return get(this, newKey); }
});
}
}
__exports__.deprecateProperty = deprecateProperty;
@@ -39123,31 +39125,28 @@
__exports__["default"] = ContainerView;
});
define("ember-views/views/core_view",
- ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+ ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
"use strict";
var cloneStates = __dependency1__.cloneStates;
var states = __dependency1__.states;
var EmberObject = __dependency2__["default"];
var Evented = __dependency3__["default"];
var ActionHandler = __dependency4__["default"];
- var defineProperty = __dependency5__.defineProperty;
- var deprecateProperty = __dependency5__.deprecateProperty;
- var get = __dependency6__.get;
- var set = __dependency7__.set;
- var computed = __dependency8__.computed;
+ var get = __dependency5__.get;
+ var computed = __dependency6__.computed;
- var typeOf = __dependency9__.typeOf;
+ var typeOf = __dependency7__.typeOf;
- var instrument = __dependency10__.instrument;
+ var instrument = __dependency8__.instrument;
- var renderBuffer = __dependency11__["default"];
+ var renderBuffer = __dependency9__["default"];
/**
`Ember.CoreView` is an abstract class that exists to give view-like behavior
to both Ember's main view class `Ember.View` and other classes like
`Ember._SimpleMetamorphView` that don't need the fully functionaltiy of
@@ -39169,13 +39168,10 @@
init: function() {
this._super();
this._transitionTo('preRender');
this._isVisible = get(this, 'isVisible');
-
- deprecateProperty(this, 'states', '_states');
- deprecateProperty(this, 'state', '_state');
},
/**
If the view is currently inserted into the DOM of a parent view, this
property will point to the parent of the view.
@@ -39794,10 +39790,11 @@
var typeOf = __dependency11__.typeOf;
var isArray = __dependency11__.isArray;
var isNone = __dependency14__.isNone;
var Mixin = __dependency13__.Mixin;
+ var deprecateProperty = __dependency10__.deprecateProperty;
var emberA = __dependency15__.A;
var dasherize = __dependency16__.dasherize;
// ES6TODO: functions on EnumerableUtils should get their own export
@@ -41935,9 +41932,11 @@
removeObserver(root, path, target, scheduledObserver);
});
}
});
+ deprecateProperty(View.prototype, 'state', '_state');
+ deprecateProperty(View.prototype, 'states', '_states');
/*
Describe how the specified actions should behave in the various
states that a view can exist in. Possible states:
\ No newline at end of file