language
stringclasses
1 value
owner
stringlengths
2
15
repo
stringlengths
2
21
sha
stringlengths
45
45
message
stringlengths
7
36.3k
path
stringlengths
1
199
patch
stringlengths
15
102k
is_multipart
bool
2 classes
Other
emberjs
ember.js
4561c61bcf9c84ae146e509cbd9e7a5b9a5245ba.json
Remove trailing whitespace
packages/ember-htmlbars/lib/helpers/with.js
@@ -52,7 +52,7 @@ import shouldDisplay from "ember-views/streams/should_display"; {{#if isProlificBlogger}} {{user.name}} has written more than {{posts.model.length}} blog posts! {{else}} - {{user.name}} has only written {{posts.model.length}} blog posts. + {{user.name}} has only written {{p...
false
Other
emberjs
ember.js
898d24d11d20bd802809dcee7cedfcbf78655dac.json
Make template in documentation for {{each}} valid.
packages/ember-htmlbars/lib/helpers/each.js
@@ -53,7 +53,7 @@ import normalizeSelf from "ember-htmlbars/utils/normalize-self"; ```javascript App.NoPeopleView = Ember.View.extend({ tagName: 'li', - template: 'No person is available, sorry' + template: '<p>No person is available, sorry</p>' }); ```
false
Other
emberjs
ember.js
c8f6731de12314b87a71054fd3ae87413c15c3c8.json
Add Vim swp files to .gitignore
.gitignore
@@ -39,3 +39,4 @@ publish_to_bower/ bower_components/ npm-debug.log .ember-cli +*.swp
false
Other
emberjs
ember.js
826d33d2b6eaf178ac65a22d455b41e4a4c5b205.json
Fix documentation for {{with}} helper.
packages/ember-htmlbars/lib/helpers/with.js
@@ -10,35 +10,56 @@ import shouldDisplay from "ember-views/streams/should_display"; Use the `{{with}}` helper when you want to alias a property to a new name. This is helpful for semantic clarity as it allows you to retain default scope or to reference a property from another `{{with}}` block. + If the alia...
false
Other
emberjs
ember.js
82fd051b09b2814fa098f21a493eec73bd8e6074.json
Fix documentation for {{each}} helper.
packages/ember-htmlbars/lib/helpers/each.js
@@ -2,6 +2,151 @@ import { get } from "ember-metal/property_get"; import { forEach } from "ember-metal/enumerable_utils"; import normalizeSelf from "ember-htmlbars/utils/normalize-self"; +/** + The `{{#each}}` helper loops over elements in a collection. It is an extension + of the base Handlebars `{{#each}}` help...
false
Other
emberjs
ember.js
196b290a5a2955f7f1058c12c70ea42154667091.json
Add a better deprecation for `{{bind-attr}}`. Example deprecation: ``` The `bind-attr` helper ('my-app-name/templates/index' @ L1:C7) is deprecated in favor of HTMLBars-style bound attributes"); ```
packages/ember-template-compiler/lib/plugins/transform-bind-attr-to-attributes.js
@@ -24,9 +24,10 @@ import { dasherize } from "ember-template-compiler/system/string"; @class TransformBindAttrToAttributes @private */ -function TransformBindAttrToAttributes() { +function TransformBindAttrToAttributes(options) { // set later within HTMLBars to the syntax package this.syntax = null; + thi...
true
Other
emberjs
ember.js
196b290a5a2955f7f1058c12c70ea42154667091.json
Add a better deprecation for `{{bind-attr}}`. Example deprecation: ``` The `bind-attr` helper ('my-app-name/templates/index' @ L1:C7) is deprecated in favor of HTMLBars-style bound attributes"); ```
packages/ember-template-compiler/tests/plugins/transform-bind-attr-to-attributes-test.js
@@ -6,16 +6,18 @@ QUnit.test("Using the `bind-attr` helper throws a deprecation", function() { expect(1); expectDeprecation(function() { - compile('<div {{bind-attr class=view.foo}}></div>'); - }, /The `bind-attr` helper is deprecated in favor of HTMLBars-style bound attributes/); + compile('<div {{bind-...
true
Other
emberjs
ember.js
b9e1c56456273351d01d9e79b67fb8ccf629d31b.json
Recognize array-likes in link-render-node Affects if/unless and possibly other places.
packages/ember-htmlbars/lib/hooks/link-render-node.js
@@ -4,7 +4,7 @@ */ import subscribe from "ember-htmlbars/utils/subscribe"; -import { isArray } from "ember-metal/utils"; +import { isArray } from "ember-runtime/utils"; import { chain, read, readArray, isStream, addDependency } from "ember-metal/streams/utils"; import { findHelper } from "ember-htmlbars/system/lo...
true
Other
emberjs
ember.js
b9e1c56456273351d01d9e79b67fb8ccf629d31b.json
Recognize array-likes in link-render-node Affects if/unless and possibly other places.
packages/ember-htmlbars/tests/helpers/if_unless_test.js
@@ -5,6 +5,7 @@ import EmberView from "ember-views/views/view"; import ObjectProxy from "ember-runtime/system/object_proxy"; import EmberObject from "ember-runtime/system/object"; import compile from "ember-template-compiler/system/compile"; +import ArrayProxy from "ember-runtime/system/array_proxy"; import { set...
true
Other
emberjs
ember.js
ed06f9ecc7af2e2191c319162630303540593c52.json
Remove non-HTMLBars template path. Manually writing template functions is largely unsupported already. This change removes a guard/check for `isHTMLBars` (we intend to stop stamping all templates with this flag in the future).
packages/ember-views/lib/views/view.js
@@ -775,11 +775,7 @@ var View = CoreView.extend( var template = get(this, 'template'); if (template) { - if (template.isHTMLBars) { - return template.render(context, options, { contextualElement: morph.contextualElement }).fragment; - } else { - return template(context, options); - ...
false
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/keywords/collection.js
@@ -5,7 +5,7 @@ import { readViewFactory } from "ember-views/streams/utils"; import CollectionView from "ember-views/views/collection_view"; -import ComponentNode from "ember-htmlbars/system/component-node"; +import ViewNodeManager from "ember-htmlbars/node-managers/view-node-manager"; import objectKeys from "embe...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/keywords/customized_outlet.js
@@ -3,7 +3,7 @@ @submodule ember-htmlbars */ -import ComponentNode from "ember-htmlbars/system/component-node"; +import ViewNodeManager from "ember-htmlbars/node-managers/view-node-manager"; import { readViewFactory } from "ember-views/streams/utils"; import { isStream } from "ember-metal/streams/utils"; @@ -25...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/keywords/real_outlet.js
@@ -4,7 +4,7 @@ */ import { get } from "ember-metal/property_get"; -import ComponentNode from "ember-htmlbars/system/component-node"; +import ViewNodeManager from "ember-htmlbars/node-managers/view-node-manager"; import topLevelViewTemplate from "ember-htmlbars/templates/top-level-view"; topLevelViewTemplate.meta...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/keywords/view.js
@@ -5,7 +5,7 @@ import { readViewFactory } from "ember-views/streams/utils"; import EmberView from "ember-views/views/view"; -import ComponentNode from "ember-htmlbars/system/component-node"; +import ViewNodeManager from "ember-htmlbars/node-managers/view-node-manager"; import objectKeys from "ember-metal/keys"; ...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/node-managers/component-node-manager.js
@@ -8,6 +8,7 @@ import { set } from "ember-metal/property_set"; import setProperties from "ember-metal/set_properties"; import View from "ember-views/views/view"; import { MUTABLE_CELL } from "ember-views/compat/attrs-proxy"; +import { instrument } from "ember-htmlbars/system/instrumentation-support"; // In theor...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/node-managers/view-node-manager.js
@@ -8,6 +8,7 @@ import View from "ember-views/views/view"; import { MUTABLE_CELL } from "ember-views/compat/attrs-proxy"; import getCellOrValue from "ember-htmlbars/hooks/get-cell-or-value"; import SafeString from "htmlbars-util/safe-string"; +import { instrument } from "ember-htmlbars/system/instrumentation-support...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/system/instrumentation-support.js
@@ -0,0 +1,41 @@ +import { + _instrumentStart, + subscribers +} from "ember-metal/instrumentation"; + +/** + * Provides instrumentation for node managers. + * + * Wrap your node manager's render and re-render methods + * with this function. + * + * @param {Object} component Component or View instance (optional) + * @...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-htmlbars/lib/system/render-view.js
@@ -1,5 +1,5 @@ import defaultEnv from "ember-htmlbars/env"; -import ComponentNode, { createOrUpdateComponent } from "ember-htmlbars/system/component-node"; +import ViewNodeManager, { createOrUpdateComponent } from "ember-htmlbars/node-managers/view-node-manager"; // This function only gets called once per render o...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-metal-views/lib/renderer.js
@@ -1,10 +1,6 @@ import run from "ember-metal/run_loop"; import { get } from "ember-metal/property_get"; import { set } from "ember-metal/property_set"; -import { - _instrumentStart, - subscribers -} from "ember-metal/instrumentation"; import buildComponentTemplate from "ember-views/system/build-component-templat...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember-routing-htmlbars/lib/keywords/render.js
@@ -6,7 +6,7 @@ import { isStream, read } from "ember-metal/streams/utils"; import { camelize } from "ember-runtime/system/string"; import generateController from "ember-routing/system/generate_controller"; import { generateControllerFactory } from "ember-routing/system/generate_controller"; -import ComponentNode fr...
true
Other
emberjs
ember.js
5f1cba209b0025d976c3bd5053ea1eea052f5d73.json
Move instrumentation to the node managers Components that don't have a view instance don't go through the renderer. This insures instrumentation is invoked anyway. Also moved system/component-node to node-managers/view-node-manager
packages/ember/tests/view_instrumentation_test.js
@@ -0,0 +1,64 @@ +import EmberHandlebars from "ember-htmlbars/compat"; +import run from "ember-metal/run_loop"; +import $ from "ember-views/system/jquery"; +import { subscribe, unsubscribe } from "ember-metal/instrumentation"; + +var compile = EmberHandlebars.compile; + +var App, $fixture; + +function setupExample() { ...
true
Other
emberjs
ember.js
e05feec0d52a4f66308b6547434897b2c01fca60.json
fix automatic mut for non-streams
packages/ember-htmlbars/lib/keywords/mut.js
@@ -2,6 +2,8 @@ import create from "ember-metal/platform/create"; import merge from "ember-metal/merge"; import { symbol } from "ember-metal/utils"; import ProxyStream from "ember-metal/streams/proxy-stream"; +import { isStream } from "ember-metal/streams/utils"; +import Stream from "ember-metal/streams/stream"; im...
true
Other
emberjs
ember.js
e05feec0d52a4f66308b6547434897b2c01fca60.json
fix automatic mut for non-streams
packages/ember-htmlbars/tests/integration/mutable_binding_test.js
@@ -273,6 +273,73 @@ QUnit.test('a mutable binding with a backing computed property and attribute pre assert.strictEqual(bottom.attrs.thingy.value, 14, "the set took effect"); }); +QUnit.test('automatic mutable bindings tolerate undefined non-stream inputs', function(assert) { + registry.register('template:compo...
true
Other
emberjs
ember.js
5107da66e567895edb821d1440ba4e4cc5e5d4bb.json
Fix a cycle caused by legacy semantics Consider a component like this: ```js // my-component.js Component.extend({ thingy: null }); ``` And an invocation like this: ```hbs {{my-component thingy=(mut someValue)}} ``` (note that `mut` is the default for old-style component invocations) In this case, because `my-c...
packages/ember-views/lib/compat/attrs-proxy.js
@@ -110,14 +110,8 @@ let AttrsProxyMixin = { }; AttrsProxyMixin[PROPERTY_DID_CHANGE] = function(key) { - let attrs = this.attrs; - - if (attrs && key in attrs) { - let possibleCell = attrs[key]; - - if (possibleCell && possibleCell[MUTABLE_CELL]) { - possibleCell.update(get(this, key)); - } + if (t...
true
Other
emberjs
ember.js
5107da66e567895edb821d1440ba4e4cc5e5d4bb.json
Fix a cycle caused by legacy semantics Consider a component like this: ```js // my-component.js Component.extend({ thingy: null }); ``` And an invocation like this: ```hbs {{my-component thingy=(mut someValue)}} ``` (note that `mut` is the default for old-style component invocations) In this case, because `my-c...
packages/ember-views/lib/views/states/default.js
@@ -1,10 +1,13 @@ import EmberError from "ember-metal/error"; +import { get } from "ember-metal/property_get"; import { propertyWillChange, propertyDidChange } from "ember-metal/property_events"; +import { MUTABLE_CELL } from "ember-views/compat/attrs-proxy"; + /** @module ember @submodule ember-views @...
true
Other
emberjs
ember.js
5107da66e567895edb821d1440ba4e4cc5e5d4bb.json
Fix a cycle caused by legacy semantics Consider a component like this: ```js // my-component.js Component.extend({ thingy: null }); ``` And an invocation like this: ```hbs {{my-component thingy=(mut someValue)}} ``` (note that `mut` is the default for old-style component invocations) In this case, because `my-c...
packages/ember-views/lib/views/states/pre_render.js
@@ -11,7 +11,8 @@ let preRender = create(_default); merge(preRender, { legacyAttrWillChange(view, key) {}, - legacyAttrDidChange(view, key) {} + legacyAttrDidChange(view, key) {}, + legacyPropertyDidChange(view, key) {} }); export default preRender;
true
Other
emberjs
ember.js
6069bb4e65e1272bb7d5d46307387c73ddb89775.json
Add empty tagName to avoid unnecessary div-tag Fixes #11056
packages/ember-htmlbars/tests/helpers/each_test.js
@@ -373,6 +373,31 @@ QUnit.test("it supports itemController", function() { strictEqual(view.childViews[0].get('_arrayController.target'), parentController, "the target property of the child controllers are set correctly"); }); +QUnit.test("itemController should not affect the DOM structure", function() { + var C...
true
Other
emberjs
ember.js
6069bb4e65e1272bb7d5d46307387c73ddb89775.json
Add empty tagName to avoid unnecessary div-tag Fixes #11056
packages/ember-views/lib/views/legacy_each_view.js
@@ -11,6 +11,7 @@ import { CONTAINER_MAP } from "ember-views/views/collection_view"; export default View.extend({ template: legacyEachTemplate, + tagName: '', _arrayController: computed(function() { var itemController = this.getAttr('itemController');
true
Other
emberjs
ember.js
5014201d48e3777b7578b2d9e44619f92cad0eae.json
Restore hyphen requirement for component lookup.
packages/ember-application/tests/system/dependency_injection/custom_resolver_test.js
@@ -14,7 +14,11 @@ QUnit.module("Ember.Application Dependency Injection – customResolver", { resolveTemplate(resolvable) { var resolvedTemplate = this._super(resolvable); if (resolvedTemplate) { return resolvedTemplate; } - return fallbackTemplate; + if (resolvable.fullNameWithout...
true
Other
emberjs
ember.js
5014201d48e3777b7578b2d9e44619f92cad0eae.json
Restore hyphen requirement for component lookup.
packages/ember-htmlbars/tests/integration/component_lookup_test.js
@@ -0,0 +1,41 @@ +import EmberView from "ember-views/views/view"; +import Registry from "container/registry"; +import compile from "ember-template-compiler/system/compile"; +import ComponentLookup from 'ember-views/component_lookup'; +//import Component from "ember-views/views/component"; +import { runAppend, runDestro...
true
Other
emberjs
ember.js
5014201d48e3777b7578b2d9e44619f92cad0eae.json
Restore hyphen requirement for component lookup.
packages/ember-views/lib/component_lookup.js
@@ -1,6 +1,16 @@ +import Ember from 'ember-metal/core'; import EmberObject from "ember-runtime/system/object"; +import { ISNT_HELPER_CACHE } from "ember-htmlbars/system/lookup-helper"; export default EmberObject.extend({ + invalidName(name) { + var invalidName = ISNT_HELPER_CACHE.get(name); + + if (invalidNa...
true
Other
emberjs
ember.js
6e63de48f3a94aa4ef3e76b484074807faa8df77.json
Allow bound outlet names Bound outlet names actually work fine without any additional work. They were just disallowed due to a very old assert that was introduced back when we were first standardizing the use of quoted strings to represent literals. This drops the assertion and adds a test that shows bound outlet nam...
packages/ember-htmlbars/lib/keywords/real_outlet.js
@@ -5,7 +5,6 @@ import { get } from "ember-metal/property_get"; import ComponentNode from "ember-htmlbars/system/component-node"; -import { isStream } from "ember-metal/streams/utils"; import topLevelViewTemplate from "ember-htmlbars/templates/top-level-view"; topLevelViewTemplate.revision = 'Ember@VERSION_STRING...
true
Other
emberjs
ember.js
6e63de48f3a94aa4ef3e76b484074807faa8df77.json
Allow bound outlet names Bound outlet names actually work fine without any additional work. They were just disallowed due to a very old assert that was introduced back when we were first standardizing the use of quoted strings to represent literals. This drops the assertion and adds a test that shows bound outlet nam...
packages/ember-routing-htmlbars/tests/helpers/outlet_test.js
@@ -239,13 +239,49 @@ QUnit.test("should not throw deprecations if {{outlet}} is used with a quoted na runAppend(top); }); -QUnit.test("should throw an assertion if {{outlet}} used with unquoted name", function() { - top.setOutletState(withTemplate("{{outlet foo}}")); - expectAssertion(function() { - runAppe...
true
Other
emberjs
ember.js
ef926752426f99285e643d3286c034a2ccddcdb3.json
Prevent error when attributes are undefined/null.
packages/ember-views/lib/compat/attrs-proxy.js
@@ -82,7 +82,7 @@ AttrsProxyMixin[PROPERTY_DID_CHANGE] = function(key) { if (attrs && key in attrs) { let possibleCell = attrs[key]; - if (possibleCell[MUTABLE_CELL]) { + if (possibleCell && possibleCell[MUTABLE_CELL]) { possibleCell.update(get(this, key)); } }
true
Other
emberjs
ember.js
ef926752426f99285e643d3286c034a2ccddcdb3.json
Prevent error when attributes are undefined/null.
packages/ember-views/tests/compat/attrs_proxy_test.js
@@ -2,6 +2,9 @@ import View from "ember-views/views/view"; import { runAppend, runDestroy } from "ember-runtime/tests/utils"; import compile from "ember-template-compiler/system/compile"; import Registry from "container/registry"; +import run from "ember-metal/run_loop"; +import { set } from "ember-metal/property_se...
true
Other
emberjs
ember.js
4d177cafd5943d3d7937945abfe392716f237d73.json
Remove dead code
packages/ember-htmlbars/lib/system/shadow-root.js
@@ -1,38 +0,0 @@ -import { internal } from "htmlbars-runtime"; - -/** @private - A ShadowRoot represents a new root scope. However, it - is not a render tree root. -*/ - -function ShadowRoot(layoutMorph, layoutTemplate, contentScope, contentTemplate) { - this.layoutMorph = layoutMorph; - this.layoutTemplate = layou...
false
Other
emberjs
ember.js
12b249632c4047c312441b69a7d51584595141dc.json
Allow publishing of idempotent-rerender PR to S3.
bin/publish_builds
@@ -3,7 +3,7 @@ echo -e "CURRENT_BRANCH: ${TRAVIS_BRANCH}\n" echo -e "PULL_REQUEST: ${TRAVIS_PULL_REQUEST}\n" -if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then +if [ "$TRAVIS_PULL_REQUEST" == "false" ] || [ "$TRAVIS_PULL_REQUEST" == "10501" ]; then if [ "$EMBER_ENV" != "production" ]; then DISABLE_JSCS=true...
false
Other
emberjs
ember.js
a233059b52fa865eac093f6076bf8736d49afe18.json
Publish Glimmer builds to S3. Make testing apps easier...
config/s3ProjectConfig.js
@@ -18,6 +18,10 @@ function fileObject(baseName, extension, contentType, currentRevision, tag, date var obj = { contentType: contentType, destinations: { + glimmer: [ + "glimmer" + fullName, + "canary/shas/" + currentRevision + fullName + ], canary: [ ...
false
Other
emberjs
ember.js
d9e5c8018fad8a1ddab2e5f1f2ddd61975ef08c1.json
Unskip mutable binding test.
packages/ember-htmlbars/tests/integration/mutable_binding_test.js
@@ -87,7 +87,7 @@ QUnit.test('a simple mutable binding using `mut` propagates properly', function( assert.strictEqual(view.get('val'), 13, "the set propagated back up"); }); -QUnit.skip('using a string value through middle tier does not trigger assertion', function(assert) { +QUnit.test('using a string value thro...
false
Other
emberjs
ember.js
27a6c57b0d15766b65a8ae1f74e1ab37e3493add.json
Intercept property changes instead of sets (cherry picked from commit b4d53bfd2d2769c4133f5f55e5551c6cc2dc87f8)
packages/ember-htmlbars/tests/integration/select_in_template_test.js
@@ -239,7 +239,7 @@ function testValueBinding(templateString) { equal(selectEl.selectedIndex, 1, "The DOM is updated to reflect the new selection"); } -QUnit.skip("select element should correctly initialize and update selectedIndex and bound properties when using valueBinding [DEPRECATED]", function() { +QUnit.te...
true
Other
emberjs
ember.js
27a6c57b0d15766b65a8ae1f74e1ab37e3493add.json
Intercept property changes instead of sets (cherry picked from commit b4d53bfd2d2769c4133f5f55e5551c6cc2dc87f8)
packages/ember-metal/lib/property_events.js
@@ -7,6 +7,9 @@ import { accumulateListeners } from "ember-metal/events"; import ObserverSet from "ember-metal/observer_set"; +import { symbol } from "ember-metal/utils"; + +export let PROPERTY_DID_CHANGE = symbol("PROPERTY_DID_CHANGE"); var beforeObserverSet = new ObserverSet(); var observerSet = new Observer...
true
Other
emberjs
ember.js
27a6c57b0d15766b65a8ae1f74e1ab37e3493add.json
Intercept property changes instead of sets (cherry picked from commit b4d53bfd2d2769c4133f5f55e5551c6cc2dc87f8)
packages/ember-metal/lib/property_set.js
@@ -1,6 +1,7 @@ import Ember from "ember-metal/core"; import { _getPath as getPath } from "ember-metal/property_get"; import { + PROPERTY_DID_CHANGE, propertyWillChange, propertyDidChange } from "ember-metal/property_events"; @@ -116,6 +117,9 @@ export function set(obj, keyName, value, tolerant) { } ...
true
Other
emberjs
ember.js
27a6c57b0d15766b65a8ae1f74e1ab37e3493add.json
Intercept property changes instead of sets (cherry picked from commit b4d53bfd2d2769c4133f5f55e5551c6cc2dc87f8)
packages/ember-views/lib/compat/attrs-proxy.js
@@ -4,7 +4,7 @@ import { Mixin } from "ember-metal/mixin"; import { on } from "ember-metal/events"; import { symbol } from "ember-metal/utils"; import objectKeys from "ember-metal/keys"; -import { INTERCEPT_SET, UNHANDLED_SET } from 'ember-metal/property_set'; +import { PROPERTY_DID_CHANGE } from "ember-metal/proper...
true
Other
emberjs
ember.js
27a6c57b0d15766b65a8ae1f74e1ab37e3493add.json
Intercept property changes instead of sets (cherry picked from commit b4d53bfd2d2769c4133f5f55e5551c6cc2dc87f8)
packages/ember-views/tests/views/view_test.js
@@ -124,7 +124,7 @@ QUnit.test("propagates dependent-key invalidated sets upstream", function() { equal(view.get('parentProp'), 'new-value', 'new value is propagated across template'); }); -QUnit.skip("propagates dependent-key invalidated bindings upstream", function() { +QUnit.test("propagates dependent-key inva...
true
Other
emberjs
ember.js
4cfb2bdb32b3df7df460ab1e20e9bb6592239298.json
Fix controller local w/ `{{#each itemController}}`
packages/ember-htmlbars/lib/helpers/-legacy-each-with-controller.js
@@ -14,19 +14,25 @@ export default function legacyEachWithControllerHelper(params, hash, blocks) { forEach(list, function(item, i) { var self; + if (blocks.template.arity === 0) { Ember.deprecate(deprecation); self = normalizeSelf(item); - self = { - self: self, - hasBoun...
true
Other
emberjs
ember.js
4cfb2bdb32b3df7df460ab1e20e9bb6592239298.json
Fix controller local w/ `{{#each itemController}}`
packages/ember-htmlbars/lib/hooks/bind-shadow-scope.js
@@ -8,10 +8,20 @@ import Component from 'ember-views/views/component'; export default function bindShadowScope(env, parentScope, shadowScope, options) { if (!options) { return; } + let didOverrideController = false; + + if (parentScope && parentScope.overrideController) { + didOverrideController = true; + ...
true
Other
emberjs
ember.js
4cfb2bdb32b3df7df460ab1e20e9bb6592239298.json
Fix controller local w/ `{{#each itemController}}`
packages/ember-htmlbars/lib/keywords/legacy-yield.js
@@ -1,5 +1,19 @@ -export default function legacyYield(morph, env, scope, params, hash, template, inverse, visitor) { +import ProxyStream from "ember-metal/streams/proxy-stream"; + +export default function legacyYield(morph, env, _scope, params, hash, template, inverse, visitor) { + let scope = _scope; + if (scope.b...
true
Other
emberjs
ember.js
4cfb2bdb32b3df7df460ab1e20e9bb6592239298.json
Fix controller local w/ `{{#each itemController}}`
packages/ember-htmlbars/lib/templates/legacy-each.hbs
@@ -1 +1 @@ -{{~#each view._arrangedContent as |item|}}{{#if attrs.itemViewClass}}{{#view attrs.itemViewClass controller=item tagName=view._itemTagName}}{{legacy-yield item}}{{/view}}{{else}}{{legacy-yield item}}{{/if}}{{else if attrs.emptyViewClass}}{{view attrs.emptyViewClass tagName=view._itemTagName}}{{/each~}} +{{...
true
Other
emberjs
ember.js
4cfb2bdb32b3df7df460ab1e20e9bb6592239298.json
Fix controller local w/ `{{#each itemController}}`
packages/ember/tests/controller_test.js
@@ -71,7 +71,7 @@ QUnit.test("Actions inside an outlet go to the associated controller", function( // This test caught a regression where {{#each}}s used directly in a template // (i.e., not inside a view or component) did not have access to a container and // would raise an exception. -QUnit.test("{{#each}} inside ...
true
Other
emberjs
ember.js
5a33e9c00b025152e3ed30981f245738c02fd52c.json
Propagate controller keyword for outlets
packages/ember-htmlbars/lib/hooks/bind-self.js
@@ -25,6 +25,10 @@ export default function bindSelf(env, scope, _self) { } newStream(scope, 'self', self, null, true); + + if (!scope.locals.controller) { + scope.locals.controller = scope.self; + } } function newStream(scope, key, newValue, renderNode, isSelf) {
true
Other
emberjs
ember.js
5a33e9c00b025152e3ed30981f245738c02fd52c.json
Propagate controller keyword for outlets
packages/ember-htmlbars/lib/node-managers/component-node-manager.js
@@ -57,7 +57,11 @@ ComponentNodeManager.create = function(renderNode, env, options) { if (attrs.viewName) { createOptions.viewName = getValue(attrs.viewName); } if (component.create && parentScope && parentScope.self) { - options._context = getValue(parentScope.self); + createOptions._context = ge...
true
Other
emberjs
ember.js
5a33e9c00b025152e3ed30981f245738c02fd52c.json
Propagate controller keyword for outlets
packages/ember-views/lib/views/component.js
@@ -172,6 +172,7 @@ var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, { @default null */ targetObject: computed('parentView', function(key) { + if (this._controller) { return this._controller; } var parentView = get(this, 'parentView'); return parentView ? get(parent...
true
Other
emberjs
ember.js
5a33e9c00b025152e3ed30981f245738c02fd52c.json
Propagate controller keyword for outlets
packages/ember/tests/helpers/link_to_test.js
@@ -1024,7 +1024,7 @@ QUnit.test("The non-block form {{link-to}} helper updates the link text when it equal(Ember.$('#contact-link:contains(Robert)', '#qunit-fixture').length, 1, "The link title is correctly updated when the route changes"); }); -QUnit.skip("The non-block form {{link-to}} helper moves into the na...
true
Other
emberjs
ember.js
5a33e9c00b025152e3ed30981f245738c02fd52c.json
Propagate controller keyword for outlets
packages/ember/tests/template_scope_test.js
@@ -35,7 +35,7 @@ QUnit.module("Template scoping examples", { } }); -QUnit.skip("Actions inside an outlet go to the associated controller", function() { +QUnit.test("Actions inside an outlet go to the associated controller", function() { expect(1); templates.index = compile("{{component-with-action action...
true
Other
emberjs
ember.js
73881e41290eb86850193fb34e085d7e46c53641.json
Fix dynamic `makeViewHelper`.
packages/ember-htmlbars/tests/system/make_view_helper_test.js
@@ -53,7 +53,6 @@ QUnit.test("can properly yield", function() { }); runAppend(view); - debugger equal(view.$().text(), 'Some Random Class - Template'); });
false
Other
emberjs
ember.js
57f05daa8fc4fd94e3507e4dab2bcbab3e32f699.json
Fix dynamic `makeViewHelper`.
package.json
@@ -23,7 +23,7 @@ "express": "^4.5.0", "github": "^0.2.3", "glob": "~4.3.2", - "htmlbars": "0.13.11", + "htmlbars": "0.13.12", "qunit-extras": "^1.3.0", "qunitjs": "^1.16.0", "route-recognizer": "0.1.5",
true
Other
emberjs
ember.js
57f05daa8fc4fd94e3507e4dab2bcbab3e32f699.json
Fix dynamic `makeViewHelper`.
packages/ember-htmlbars/lib/helpers.js
@@ -3,9 +3,7 @@ @submodule ember-htmlbars */ -import Ember from 'ember-metal/core'; // Ember.assert import o_create from "ember-metal/platform/create"; -import { registerKeyword } from "ember-htmlbars/keywords"; /** @private @@ -26,17 +24,6 @@ var helpers = o_create(null); @param {Object|Function} helperFu...
true
Other
emberjs
ember.js
57f05daa8fc4fd94e3507e4dab2bcbab3e32f699.json
Fix dynamic `makeViewHelper`.
packages/ember-htmlbars/lib/hooks/invoke-helper.js
@@ -1,12 +1,21 @@ +import Ember from 'ember-metal/core'; // Ember.assert import getValue from "ember-htmlbars/hooks/get-value"; + + export default function invokeHelper(morph, env, scope, visitor, _params, _hash, helper, templates, context) { var params, hash; if (typeof helper === 'function') { params...
true
Other
emberjs
ember.js
57f05daa8fc4fd94e3507e4dab2bcbab3e32f699.json
Fix dynamic `makeViewHelper`.
packages/ember-htmlbars/tests/system/make_view_helper_test.js
@@ -17,11 +17,15 @@ QUnit.module("ember-htmlbars: makeViewHelper", { } }); -QUnit.skip("makes helpful assertion when called with invalid arguments", function() { +QUnit.test("makes helpful assertion when called with invalid arguments", function() { var SomeRandom = EmberView.extend({ template: compile("So...
true
Other
emberjs
ember.js
57f05daa8fc4fd94e3507e4dab2bcbab3e32f699.json
Fix dynamic `makeViewHelper`.
packages/ember/tests/helpers/helper_registration_test.js
@@ -84,7 +84,7 @@ QUnit.test("Bound helpers registered on the container can be late-invoked", func ok(!helpers['x-reverse'], "Container-registered helper doesn't wind up on global helpers hash"); }); -QUnit.skip("Bound `makeViewHelper` helpers registered on the container can be used", function() { +QUnit.test("Bo...
true
Other
emberjs
ember.js
2d501df08085018bcab80148ce941ce4410a6c03.json
Remove unused imports in Ember.TextArea.
packages/ember-views/lib/views/text_area.js
@@ -2,10 +2,8 @@ @module ember @submodule ember-views */ -import { get } from "ember-metal/property_get"; import Component from "ember-views/views/component"; import TextSupport from "ember-views/mixins/text_support"; -import { observer } from "ember-metal/mixin"; /** The internal class used to create textar...
false
Other
emberjs
ember.js
0e674a4eb9e08ad98909db8de78b89e505114405.json
Update HTMLBars to v0.13.11. * Remove 'value' attribute hacks. * Add `AttrMorph.prototype.getContent`.
package.json
@@ -23,7 +23,7 @@ "express": "^4.5.0", "github": "^0.2.3", "glob": "~4.3.2", - "htmlbars": "0.13.10", + "htmlbars": "0.13.11", "qunit-extras": "^1.3.0", "qunitjs": "^1.16.0", "route-recognizer": "0.1.5",
false
Other
emberjs
ember.js
a80574534bf0ec76d34ac3cdbc956df03c2fe183.json
Use readDOMAttr + attributeBinding for <textarea>. The new `readDOMAttr` API allows us to remove this manual `value` property binding in `Ember.TextArea`.
packages/ember-views/lib/views/text_area.js
@@ -1,4 +1,3 @@ - /** @module ember @submodule ember-views @@ -39,22 +38,9 @@ export default Component.extend(TextSupport, { 'selectionStart', 'wrap', 'lang', - 'dir' + 'dir', + 'value' ], rows: null, - cols: null, - - _updateElementValue: observer('value', function() { - // We do ...
true
Other
emberjs
ember.js
a80574534bf0ec76d34ac3cdbc956df03c2fe183.json
Use readDOMAttr + attributeBinding for <textarea>. The new `readDOMAttr` API allows us to remove this manual `value` property binding in `Ember.TextArea`.
packages/ember-views/tests/views/text_area_test.js
@@ -186,9 +186,11 @@ forEach.call(['cut', 'paste', 'input'], function(eventName) { }); textArea.$().val('new value'); - textArea.trigger(eventName, EmberObject.create({ - type: eventName - })); + run(function() { + textArea.trigger(eventName, EmberObject.create({ + type: eventName ...
true
Other
emberjs
ember.js
4e585da9dc2882e6babd11499acad6e450805eb9.json
Fix issue with inputs getting re-rendered
packages/ember-htmlbars/lib/keywords/input.js
@@ -1,4 +1,5 @@ import Ember from "ember-metal/core"; +import { assign } from "ember-metal/merge"; export default { setupState(lastState, env, scope, params, hash) { @@ -8,7 +9,7 @@ export default { Ember.assert("{{input type='checkbox'}} does not support setting `value=someBooleanValue`;" + ...
true
Other
emberjs
ember.js
4e585da9dc2882e6babd11499acad6e450805eb9.json
Fix issue with inputs getting re-rendered
packages/ember-htmlbars/tests/helpers/input_test.js
@@ -62,8 +62,13 @@ QUnit.test("should become disabled if the disabled attribute is true", function( QUnit.test("input value is updated when setting value property of view", function() { equal(view.$('input').val(), "hello", "renders text field with value"); + + let id = view.$('input').prop('id'); + run(null,...
true
Other
emberjs
ember.js
4e585da9dc2882e6babd11499acad6e450805eb9.json
Fix issue with inputs getting re-rendered
packages/ember-metal/lib/merge.js
@@ -32,3 +32,16 @@ export default function merge(original, updates) { return original; } + +export function assign(original, ...args) { + for (let i=0, l=args.length; i<l; i++) { + let arg = args[i]; + if (!arg) { continue; } + + for (let prop in arg) { + if (arg.hasOwnProperty(prop)) { original[pr...
true
Other
emberjs
ember.js
37b21bf917ac00fe70ace5c6a37419f2110b583a.json
Remove vestigial `states.changingKeys`
packages/ember-routing/lib/system/route.js
@@ -147,9 +147,6 @@ var Route = EmberObject.extend(ActionHandler, Evented, { }, allowOverrides: (controller, prop) => { return this._updatingQPChanged(controller, map[prop]); - }, - changingKeys: (controller, prop) => { - return this._updateSerializedQPValue(controlle...
false
Other
emberjs
ember.js
ce28b3ca811e520e86de8caa8a632fab58c6c4bf.json
Notify view controller when its parentView changes
packages/ember-views/lib/mixins/view_context_support.js
@@ -8,6 +8,7 @@ import { get } from "ember-metal/property_get"; import { set } from "ember-metal/property_set"; import LegacyViewSupport from "ember-views/mixins/legacy_view_support"; import { observer } from "ember-metal/mixin"; +import { on } from "ember-metal/events"; var ViewContextSupport = Mixin.create(Lega...
true
Other
emberjs
ember.js
ce28b3ca811e520e86de8caa8a632fab58c6c4bf.json
Notify view controller when its parentView changes
packages/ember-views/tests/views/view/controller_test.js
@@ -4,7 +4,7 @@ import ContainerView from "ember-views/views/container_view"; QUnit.module("Ember.View - controller property"); -QUnit.skip("controller property should be inherited from nearest ancestor with controller", function() { +QUnit.test("controller property should be inherited from nearest ancestor with c...
true
Other
emberjs
ember.js
dc97966be2134d794611b0c693193caad8207dc0.json
Preserve controller instance across rerenders
packages/ember-htmlbars/lib/keywords/with.js
@@ -5,19 +5,23 @@ export default { setupState(state, env, scope, params, hash) { var controller = hash.controller; - if (controller && !state.controller) { - var context = params[0]; - var controllerFactory = env.container.lookupFactory('controller:' + controller); - var parentController = s...
true
Other
emberjs
ember.js
dc97966be2134d794611b0c693193caad8207dc0.json
Preserve controller instance across rerenders
packages/ember-htmlbars/tests/helpers/with_test.js
@@ -226,7 +226,7 @@ QUnit.test("it should support #with this as qux", function() { QUnit.module("Handlebars {{#with foo}} with defined controller"); -QUnit.skip("it should wrap context with object controller [DEPRECATED]", function() { +QUnit.test("it should wrap context with object controller [DEPRECATED]", funct...
true
Other
emberjs
ember.js
a2d9a41354d40c2737a64c94308bd488562fd713.json
Fix incorrect `typeOf` import. `typeOf` moved from `ember-metal/utils` to `ember-runtime/utils` as of https://github.com/emberjs/ember.js/pull/10988.
packages/ember-views/lib/views/core_view.js
@@ -10,7 +10,7 @@ import ActionHandler from "ember-runtime/mixins/action_handler"; import { get } from "ember-metal/property_get"; -import { typeOf } from "ember-metal/utils"; +import { typeOf } from "ember-runtime/utils"; import { internal } from "htmlbars-runtime"; function K() { return this; }
false
Other
emberjs
ember.js
53e6ebaeff50de9265cff4bfacf6611ac9576b19.json
Fix lint errors. * `get` was unused in ember-routing-htmlbars/keywords/action * Indentation was incorrect in ember-htmlbars/tests/integration/mutable_binding_test
packages/ember-htmlbars/tests/integration/mutable_binding_test.js
@@ -189,6 +189,7 @@ QUnit.test('a simple mutable binding using `mut` is available in hooks', functio assert.strictEqual(view.get('val'), 13, "the set propagated back up"); }); +// jscs:disable validateIndentation if (Ember.FEATURES.isEnabled('ember-htmlbars-component-generation')) { QUnit.test('mutable bindin...
true
Other
emberjs
ember.js
53e6ebaeff50de9265cff4bfacf6611ac9576b19.json
Fix lint errors. * `get` was unused in ember-routing-htmlbars/keywords/action * Indentation was incorrect in ember-htmlbars/tests/integration/mutable_binding_test
packages/ember-routing-htmlbars/lib/keywords/action.js
@@ -4,7 +4,6 @@ */ import Ember from "ember-metal/core"; // Handlebars, uuid, FEATURES, assert, deprecate -import { get } from "ember-metal/property_get"; import { uuid } from "ember-metal/utils"; import run from "ember-metal/run_loop"; import { readUnwrappedModel } from "ember-views/streams/utils";
true
Other
emberjs
ember.js
8732970e6bee9deea2fb17e68f658c1bb5387efd.json
Fix controller usage in {{action}} and sendAction
packages/ember-routing-htmlbars/lib/keywords/action.js
@@ -36,7 +36,7 @@ export default { target = read(hash.target); } } else { - target = get(env.view, 'controller') || read(scope.self); + target = read(scope.locals.controller) || read(scope.self); } return { actionName, actionArgs, target };
true
Other
emberjs
ember.js
8732970e6bee9deea2fb17e68f658c1bb5387efd.json
Fix controller usage in {{action}} and sendAction
packages/ember-views/lib/views/component.js
@@ -118,6 +118,7 @@ var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, { init() { this._super.apply(this, arguments); + set(this, 'controller', this); set(this, 'context', this); },
true
Other
emberjs
ember.js
8732970e6bee9deea2fb17e68f658c1bb5387efd.json
Fix controller usage in {{action}} and sendAction
packages/ember-views/tests/views/component_test.js
@@ -29,7 +29,7 @@ QUnit.test("The context of an Ember.Component is itself", function() { strictEqual(component, component.get('context'), "A component's context is itself"); }); -QUnit.skip("The controller (target of `action`) of an Ember.Component is itself", function() { +QUnit.test("The controller (target of `...
true
Other
emberjs
ember.js
c8dfd40c941fe917f19c2d462490ad1ecea63d18.json
Fix preventDefault on link-to
packages/ember-routing-views/lib/views/link.js
@@ -276,7 +276,7 @@ var LinkComponent = EmberComponent.extend({ _invoke(event) { if (!isSimpleClick(event)) { return true; } - if (this.preventDefault !== false) { + if (this.attrs.preventDefault !== false) { var targetAttribute = this.attrs.target; if (!targetAttribute || targetAttribute ...
true
Other
emberjs
ember.js
c8dfd40c941fe917f19c2d462490ad1ecea63d18.json
Fix preventDefault on link-to
packages/ember/tests/helpers/link_to_test.js
@@ -1141,7 +1141,7 @@ QUnit.test("the {{link-to}} helper calls preventDefault", function() { equal(event.isDefaultPrevented(), true, "should preventDefault"); }); -QUnit.skip("the {{link-to}} helper does not call preventDefault if `preventDefault=false` is passed as an option", function() { +QUnit.test("the {{lin...
true
Other
emberjs
ember.js
f68ceeb01a65f8c53e15ecfa3b2c3dad490493d0.json
Add support for intercepting get and set These hooks are internal-only, not exposed publicly, and are only intended to be used to emulate deprecated functionality for the moment.
packages/ember-htmlbars/tests/integration/mutable_binding_test.js
@@ -188,3 +188,40 @@ QUnit.test('a simple mutable binding using `mut` is available in hooks', functio assert.strictEqual(bottom.attrs.setMe.value(), 13, "precond - the set took effect"); assert.strictEqual(view.get('val'), 13, "the set propagated back up"); }); + +if (Ember.FEATURES.isEnabled('ember-htmlbars-com...
true
Other
emberjs
ember.js
f68ceeb01a65f8c53e15ecfa3b2c3dad490493d0.json
Add support for intercepting get and set These hooks are internal-only, not exposed publicly, and are only intended to be used to emulate deprecated functionality for the moment.
packages/ember-metal/lib/property_get.js
@@ -10,9 +10,13 @@ import { hasThis as pathHasThis } from "ember-metal/path_cache"; import { hasPropertyAccessors } from "ember-metal/platform/define_property"; +import { symbol } from "ember-metal/utils"; var FIRST_KEY = /^([^\.]+)/; +export let INTERCEPT_GET = symbol("INTERCEPT_GET"); +export let UNHANDLED_...
true
Other
emberjs
ember.js
f68ceeb01a65f8c53e15ecfa3b2c3dad490493d0.json
Add support for intercepting get and set These hooks are internal-only, not exposed publicly, and are only intended to be used to emulate deprecated functionality for the moment.
packages/ember-metal/lib/property_set.js
@@ -12,6 +12,10 @@ import { } from "ember-metal/path_cache"; import { hasPropertyAccessors } from "ember-metal/platform/define_property"; +import { symbol } from "ember-metal/utils"; +export let INTERCEPT_SET = symbol("INTERCEPT_SET"); +export let UNHANDLED_SET = symbol("UNHANDLED_SET"); + /** Sets the value of...
true
Other
emberjs
ember.js
f68ceeb01a65f8c53e15ecfa3b2c3dad490493d0.json
Add support for intercepting get and set These hooks are internal-only, not exposed publicly, and are only intended to be used to emulate deprecated functionality for the moment.
packages/ember-metal/tests/accessors/get_test.js
@@ -1,7 +1,9 @@ import { testBoth } from 'ember-metal/tests/props_helper'; import { get, - getWithDefault + getWithDefault, + INTERCEPT_GET, + UNHANDLED_GET } from 'ember-metal/property_get'; import { Mixin, @@ -30,6 +32,54 @@ QUnit.test('should get arbitrary properties on an object', function() { }); ...
true
Other
emberjs
ember.js
f68ceeb01a65f8c53e15ecfa3b2c3dad490493d0.json
Add support for intercepting get and set These hooks are internal-only, not exposed publicly, and are only intended to be used to emulate deprecated functionality for the moment.
packages/ember-metal/tests/accessors/set_test.js
@@ -1,5 +1,5 @@ -import { get } from 'ember-metal/property_get'; -import { set } from 'ember-metal/property_set'; +import { get, INTERCEPT_GET } from 'ember-metal/property_get'; +import { set, INTERCEPT_SET, UNHANDLED_SET } from 'ember-metal/property_set'; QUnit.module('set'); @@ -27,6 +27,115 @@ QUnit.test('shoul...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
.travis.yml
@@ -52,5 +52,5 @@ env: - TEST_SUITE=built-tests EMBER_ENV=production DISABLE_JSCS=true DISABLE_JSHINT=true - TEST_SUITE=old-jquery - TEST_SUITE=extend-prototypes - - TEST_SUITE=node EMBER_ENV=production DISABLE_JSCS=true DISABLE_JSHINT=true + - TEST_SUITE=node DISABLE_JSCS=true DISABLE_JSHINT=true ...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/container/lib/container.js
@@ -7,7 +7,7 @@ import dictionary from 'ember-metal/dictionary'; var Registry; /** - A lightweight container used to instantiate and cache objects. + A container used to instantiate and cache objects. Every `Container` must be associated with a `Registry`, which is referenced to determine the factory and opti...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/container/lib/registry.js
@@ -10,7 +10,7 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) { } /** - A lightweight registry used to store factory and option information keyed + A registry used to store factory and option information keyed by type. A `Registry` stores the factory and option information needed ...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-application/lib/system/application.js
@@ -376,6 +376,7 @@ var Application = Namespace.extend(DeferredMixin, { var App = Ember.Application.create(); App.deferReadiness(); + // Ember.$ is a reference to the jQuery object/function Ember.$.getJSON('/auth-token', function(token) { App.token = token; @@ -456,9 +457,9 @@ var Applicati...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-htmlbars/lib/keywords/component.js
@@ -1,9 +1,11 @@ export default { setupState(lastState, env, scope, params, hash) { - return { + let state = { componentPath: env.hooks.getValue(params[0]), componentNode: lastState && lastState.componentNode }; + + return state; }, render(morph, env, scope, params, hash, templat...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-htmlbars/lib/templates/select-option.hbs
@@ -1 +1 @@ -{{view.label}} \ No newline at end of file +{{~view.label~}}
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-htmlbars/tests/helpers/component_test.js
@@ -153,6 +153,26 @@ if (Ember.FEATURES.isEnabled('ember-htmlbars-component-helper')) { }, /HTMLBars error: Could not find component named "does-not-exist"./, "Expected missing component to generate an exception"); }); + QUnit.test("component with unquoted param resolving to a component, then non-existent co...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-metal/lib/core.js
@@ -94,11 +94,14 @@ if ('undefined' === typeof Ember.ENV.DISABLE_RANGE_API) { @static @since 1.1.0 */ +Ember.FEATURES = DEFAULT_FEATURES; //jshint ignore:line -Ember.FEATURES = Ember.ENV.FEATURES; - -if (!Ember.FEATURES) { - Ember.FEATURES = DEFAULT_FEATURES; //jshint ignore:line +if (Ember.ENV.FEATURES) { + ...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-metal/lib/expand_properties.js
@@ -22,7 +22,7 @@ var SPLIT_REGEX = /\{|\}/; Ember.expandProperties('foo.bar', echo); //=> 'foo.bar' Ember.expandProperties('{foo,bar}', echo); //=> 'foo', 'bar' Ember.expandProperties('foo.{bar,baz}', echo); //=> 'foo.bar', 'foo.baz' - Ember.expandProperties('{foo,bar}.baz', ec...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-metal/lib/run_loop.js
@@ -126,12 +126,12 @@ run.join = function() { ```javascript App.RichTextEditorComponent = Ember.Component.extend({ - initializeTinyMCE: function() { + initializeTinyMCE: Ember.on('didInsertElement', function() { tinymce.init({ selector: '#' + this.$().prop('id'), setup: Ember.run....
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-runtime/lib/mixins/promise_proxy.js
@@ -34,7 +34,7 @@ function tap(proxy, promise) { } /** - A low level mixin making ObjectProxy, ObjectController or ArrayController's promise aware. + A low level mixin making ObjectProxy, ObjectController or ArrayControllers promise-aware. ```javascript var ObjectPromiseController = Ember.ObjectController...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-views/lib/views/component.js
@@ -140,19 +140,18 @@ var Component = View.extend(TargetActionSupport, ComponentTemplateDeprecation, { @deprecated @property template */ - template: computed({ - get: function() { + template: computed('templateName', { + get() { var templateName = get(this, 'templateName'); var template =...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-views/lib/views/select.js
@@ -22,8 +22,8 @@ import { observer } from "ember-metal/mixin"; import { defineProperty } from "ember-metal/properties"; import htmlbarsTemplate from "ember-htmlbars/templates/select"; -import selectOptionTemplate from "ember-htmlbars/templates/select-option"; -import selectOptgroupTemplate from "ember-htmlbars/tem...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-views/lib/views/states/default.js
@@ -1,7 +1,5 @@ import EmberError from "ember-metal/error"; -function K() { return this; } - /** @module ember @submodule ember-views @@ -25,9 +23,9 @@ export default { return true; // continue event propagation }, - cleanup: K, - destroyElement: K, + cleanup() { } , + destroyElement() { }, - rer...
true
Other
emberjs
ember.js
d31876afb241986978d7c4472fc12ddfc195f9c7.json
Resolve master merge conflicts
packages/ember-views/lib/views/states/pre_render.js
@@ -5,6 +5,4 @@ import create from 'ember-metal/platform/create'; @module ember @submodule ember-views */ -var preRender = create(_default); - -export default preRender; +export default create(_default);
true