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 | 2bde50dc4252dffeba0ff34eef1ae0368cbf18b3.json | Introduce Registry#container method
This is the preferred method for constructing a Container based on its
associated Registry. | packages/ember-views/tests/views/view/nested_view_ordering_test.js | @@ -1,5 +1,4 @@
import Registry from "container/registry";
-import Container from "container/container";
import run from "ember-metal/run_loop";
import EmberView from "ember-views/views/view";
@@ -10,7 +9,7 @@ var registry, container, view;
QUnit.module("EmberView - Nested View Ordering", {
setup: function() {
registry = new Registry();
- container = new Container(registry);
+ container = registry.container();
},
teardown: function() {
run(function() { | true |
Other | emberjs | ember.js | 2bde50dc4252dffeba0ff34eef1ae0368cbf18b3.json | Introduce Registry#container method
This is the preferred method for constructing a Container based on its
associated Registry. | packages/ember-views/tests/views/view/template_test.js | @@ -1,5 +1,4 @@
import Registry from "container/registry";
-import Container from "container/container";
import { get } from "ember-metal/property_get";
import run from "ember-metal/run_loop";
import EmberObject from "ember-runtime/system/object";
@@ -10,7 +9,7 @@ var registry, container, view;
QUnit.module("EmberView - Template Functionality", {
setup: function() {
registry = new Registry();
- container = new Container(registry);
+ container = registry.container();
registry.optionsForType('template', { instantiate: false });
},
teardown: function() { | true |
Other | emberjs | ember.js | a5fe52c575f09b38a5b9b133d8b24b206cfe13e2.json | Improve docs for Container / Registry | packages/container/lib/container.js | @@ -2,9 +2,19 @@ import Ember from 'ember-metal/core'; // Ember.assert
import emberKeys from "ember-metal/keys";
import dictionary from 'ember-metal/dictionary';
-// A lightweight container that helps to assemble and decouple components.
-// Public api for the container is still in flux.
-// The public api, specified on the application namespace should be considered the stable api.
+/**
+ A lightweight container used to instantiate and cache objects.
+
+ Every `Container` must be associated with a `Registry`, which is referenced
+ to determine the factory and options that should be used to instantiate
+ objects.
+
+ The public API for `Container` is still in flux and should not be considered
+ stable.
+
+ @private
+ @class Container
+ */
function Container(options) {
Ember.assert("A Registry instance must be passed as an option when constructing a Container.", options && options.registry);
| true |
Other | emberjs | ember.js | a5fe52c575f09b38a5b9b133d8b24b206cfe13e2.json | Improve docs for Container / Registry | packages/container/lib/registry.js | @@ -3,9 +3,19 @@ import dictionary from 'ember-metal/dictionary';
var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
-// A lightweight registry that helps to assemble and decouple components.
-// Public api for the registry is still in flux.
-// The public api, specified on the application namespace should be considered the stable api.
+/**
+ A lightweight registry used to store factory and option information keyed
+ by type.
+
+ A `Registry` stores the factory and option information needed by a
+ `Container` to instantiate and cache objects.
+
+ The public API for `Registry` is still in flux and should not be considered
+ stable.
+
+ @private
+ @class Registry
+*/
function Registry(options) {
options = options || {};
@@ -260,20 +270,21 @@ Registry.prototype = {
```javascript
var registry = new Registry();
+ var container = new Container({registry: registry});
// if all of type `connection` must not be singletons
registry.optionsForType('connection', { singleton: false });
registry.register('connection:twitter', TwitterConnection);
registry.register('connection:facebook', FacebookConnection);
- var twitter = registry.lookup('connection:twitter');
- var twitter2 = registry.lookup('connection:twitter');
+ var twitter = container.lookup('connection:twitter');
+ var twitter2 = container.lookup('connection:twitter');
twitter === twitter2; // => false
- var facebook = registry.lookup('connection:facebook');
- var facebook2 = registry.lookup('connection:facebook');
+ var facebook = container.lookup('connection:facebook');
+ var facebook2 = container.lookup('connection:facebook');
facebook === facebook2; // => false
```
@@ -338,15 +349,16 @@ Registry.prototype = {
```javascript
var registry = new Registry();
+ var container = new Container({registry: registry});
registry.register('router:main', Router);
registry.register('controller:user', UserController);
registry.register('controller:post', PostController);
registry.typeInjection('controller', 'router', 'router:main');
- var user = registry.lookup('controller:user');
- var post = registry.lookup('controller:post');
+ var user = container.lookup('controller:user');
+ var post = container.lookup('controller:post');
user.router instanceof Router; //=> true
post.router instanceof Router; //=> true
@@ -364,8 +376,6 @@ Registry.prototype = {
typeInjection: function(type, property, fullName) {
Ember.assert('fullName must be a proper full name', this.validateFullName(fullName));
- // if (this.parent) { illegalChildOperation('typeInjection'); }
-
var fullNameType = fullName.split(':')[0];
if (fullNameType === type) {
throw new Error('Cannot inject a `' + fullName +
@@ -392,6 +402,7 @@ Registry.prototype = {
```javascript
var registry = new Registry();
+ var container = new Container({registry: registry});
registry.register('source:main', Source);
registry.register('model:user', User);
@@ -404,8 +415,8 @@ Registry.prototype = {
// injecting one fullName on another type
registry.injection('model', 'source', 'source:main');
- var user = registry.lookup('model:user');
- var post = registry.lookup('model:post');
+ var user = container.lookup('model:user');
+ var post = container.lookup('model:post');
user.source instanceof Source; //=> true
post.source instanceof Source; //=> true
@@ -422,8 +433,6 @@ Registry.prototype = {
@param {String} injectionName
*/
injection: function(fullName, property, injectionName) {
- // if (this.parent) { illegalChildOperation('injection'); }
-
this.validateFullName(injectionName);
var normalizedInjectionName = this.normalize(injectionName);
@@ -489,6 +498,7 @@ Registry.prototype = {
```javascript
var registry = new Registry();
+ var container = new Container({registry: registry});
registry.register('store:main', Store);
registry.register('store:secondary', OtherStore);
@@ -501,9 +511,9 @@ Registry.prototype = {
// injecting one fullName on another fullName
registry.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
- var UserFactory = registry.lookupFactory('model:user');
- var PostFactory = registry.lookupFactory('model:post');
- var store = registry.lookup('store:main');
+ var UserFactory = container.lookupFactory('model:user');
+ var PostFactory = container.lookupFactory('model:post');
+ var store = container.lookup('store:main');
UserFactory.store instanceof Store; //=> true
UserFactory.secondaryStore instanceof OtherStore; //=> false | true |
Other | emberjs | ember.js | 00258675329766e7be1712fc49dd976ed5028e6e.json | Keep bound view classes in separate modules. | packages/ember-htmlbars/lib/helpers/if_unless.js | @@ -9,7 +9,7 @@ import shouldDisplay from "ember-views/streams/should_display";
import { read } from "ember-metal/streams/utils";
import { get } from "ember-metal/property_get";
import { isStream } from "ember-metal/streams/utils";
-import { BoundIfView } from "ember-views/views/bound_view";
+import BoundIfView from "ember-views/views/bound_if_view";
import emptyTemplate from "ember-htmlbars/templates/empty";
| true |
Other | emberjs | ember.js | 00258675329766e7be1712fc49dd976ed5028e6e.json | Keep bound view classes in separate modules. | packages/ember-htmlbars/lib/helpers/partial.js | @@ -1,6 +1,6 @@
import { get } from "ember-metal/property_get";
import { isStream } from "ember-metal/streams/utils";
-import { BoundPartialView } from "ember-views/views/bound_view";
+import BoundPartialView from "ember-views/views/bound_partial_view";
import lookupPartial from "ember-views/system/lookup_partial";
import emptyTemplate from "ember-htmlbars/templates/empty";
| true |
Other | emberjs | ember.js | 00258675329766e7be1712fc49dd976ed5028e6e.json | Keep bound view classes in separate modules. | packages/ember-views/lib/mixins/normalized_rerender_if_needed.js | @@ -0,0 +1,40 @@
+/**
+@module ember
+@submodule ember-views
+*/
+
+import { get } from "ember-metal/property_get";
+import { Mixin } from 'ember-metal/mixin';
+import merge from "ember-metal/merge";
+import {
+ cloneStates,
+ states as viewStates
+} from "ember-views/views/states";
+
+var states = cloneStates(viewStates);
+
+merge(states._default, {
+ rerenderIfNeeded: function() { return this; }
+});
+
+merge(states.inDOM, {
+ rerenderIfNeeded: function(view) {
+ if (view.normalizedValue() !== view._lastNormalizedValue) {
+ view.rerender();
+ }
+ }
+});
+
+export default Mixin.create({
+ _states: states,
+
+ normalizedValue: function() {
+ var value = this.lazyValue.value();
+ var valueNormalizer = get(this, 'valueNormalizerFunc');
+ return valueNormalizer ? valueNormalizer(value) : value;
+ },
+
+ rerenderIfNeeded: function() {
+ this.currentState.rerenderIfNeeded(this);
+ },
+}); | true |
Other | emberjs | ember.js | 00258675329766e7be1712fc49dd976ed5028e6e.json | Keep bound view classes in separate modules. | packages/ember-views/lib/views/bound_if_view.js | @@ -0,0 +1,33 @@
+import { set } from "ember-metal/property_set";
+import run from 'ember-metal/run_loop';
+import _MetamorphView from "ember-views/views/metamorph_view";
+import NormalizedRerenderIfNeededSupport from "ember-views/mixins/normalized_rerender_if_needed";
+
+export default _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
+ init: function() {
+ this._super();
+
+ var self = this;
+
+ this.conditionStream.subscribe(this._wrapAsScheduled(function() {
+ run.scheduleOnce('render', self, 'rerenderIfNeeded');
+ }));
+ },
+
+ normalizedValue: function() {
+ return this.conditionStream.value();
+ },
+
+ render: function(buffer) {
+ var result = this.conditionStream.value();
+ this._lastNormalizedValue = result;
+
+ if (result) {
+ set(this, 'template', this.truthyTemplate);
+ } else {
+ set(this, 'template', this.falsyTemplate);
+ }
+
+ return this._super(buffer);
+ }
+}); | true |
Other | emberjs | ember.js | 00258675329766e7be1712fc49dd976ed5028e6e.json | Keep bound view classes in separate modules. | packages/ember-views/lib/views/bound_partial_view.js | @@ -0,0 +1,40 @@
+/**
+@module ember
+@submodule ember-views
+*/
+
+import { set } from "ember-metal/property_set";
+import run from 'ember-metal/run_loop';
+import _MetamorphView from "ember-views/views/metamorph_view";
+import NormalizedRerenderIfNeededSupport from "ember-views/mixins/normalized_rerender_if_needed";
+import lookupPartial from "ember-views/system/lookup_partial";
+import run from 'ember-metal/run_loop';
+
+export default _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
+ init: function() {
+ this._super();
+
+ var self = this;
+
+ this.templateNameStream.subscribe(this._wrapAsScheduled(function() {
+ run.scheduleOnce('render', self, 'rerenderIfNeeded');
+ }));
+ },
+
+ normalizedValue: function() {
+ return this.templateNameStream.value();
+ },
+
+ render: function(buffer) {
+ var templateName = this.normalizedValue();
+ this._lastNormalizedValue = templateName;
+
+ if (templateName) {
+ set(this, 'template', lookupPartial(this, templateName));
+ } else {
+ set(this, 'template', this.emptyTemplate);
+ }
+
+ return this._super(buffer);
+ }
+}); | true |
Other | emberjs | ember.js | 00258675329766e7be1712fc49dd976ed5028e6e.json | Keep bound view classes in separate modules. | packages/ember-views/lib/views/bound_view.js | @@ -5,45 +5,8 @@
import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
-import merge from "ember-metal/merge";
-import {
- cloneStates,
- states as viewStates
-} from "ember-views/views/states";
import _MetamorphView from "ember-views/views/metamorph_view";
-import lookupPartial from "ember-views/system/lookup_partial";
-import { Mixin } from 'ember-metal/mixin';
-import run from 'ember-metal/run_loop';
-
-function K() { return this; }
-
-var states = cloneStates(viewStates);
-
-merge(states._default, {
- rerenderIfNeeded: K
-});
-
-merge(states.inDOM, {
- rerenderIfNeeded: function(view) {
- if (view.normalizedValue() !== view._lastNormalizedValue) {
- view.rerender();
- }
- }
-});
-
-var NormalizedRerenderIfNeededSupport = Mixin.create({
- _states: states,
-
- normalizedValue: function() {
- var value = this.lazyValue.value();
- var valueNormalizer = get(this, 'valueNormalizerFunc');
- return valueNormalizer ? valueNormalizer(value) : value;
- },
-
- rerenderIfNeeded: function() {
- this.currentState.rerenderIfNeeded(this);
- },
-});
+import NormalizedRerenderIfNeededSupport from "ember-views/mixins/normalized_rerender_if_needed";
/**
`Ember._BoundView` is a private view created by the Handlebars
@@ -59,7 +22,7 @@ var NormalizedRerenderIfNeededSupport = Mixin.create({
@extends Ember._MetamorphView
@private
*/
-var BoundView = _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
+export default _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
instrumentName: 'bound',
/**
@@ -188,67 +151,3 @@ var BoundView = _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
return this._super(buffer);
}
});
-
-var BoundIfView = _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
- init: function() {
- this._super();
-
- var self = this;
-
- this.conditionStream.subscribe(this._wrapAsScheduled(function() {
- run.scheduleOnce('render', self, 'rerenderIfNeeded');
- }));
- },
-
- normalizedValue: function() {
- return this.conditionStream.value();
- },
-
- render: function(buffer) {
- var result = this.conditionStream.value();
- this._lastNormalizedValue = result;
-
- if (result) {
- set(this, 'template', this.truthyTemplate);
- } else {
- set(this, 'template', this.falsyTemplate);
- }
-
- return this._super(buffer);
- }
-});
-
-var BoundPartialView = _MetamorphView.extend(NormalizedRerenderIfNeededSupport, {
- init: function() {
- this._super();
-
- var self = this;
-
- this.templateNameStream.subscribe(this._wrapAsScheduled(function() {
- run.scheduleOnce('render', self, 'rerenderIfNeeded');
- }));
- },
-
- normalizedValue: function() {
- return this.templateNameStream.value();
- },
-
- render: function(buffer) {
- var templateName = this.normalizedValue();
- this._lastNormalizedValue = templateName;
-
- if (templateName) {
- set(this, 'template', lookupPartial(this, templateName));
- } else {
- set(this, 'template', this.emptyTemplate);
- }
-
- return this._super(buffer);
- }
-});
-
-export default BoundView;
-export {
- BoundIfView,
- BoundPartialView
-}; | true |
Other | emberjs | ember.js | 87df91f451456550894f7e7101fce76ff950b2c0.json | Avoid global variable leak in script files | bin/publish_to_s3.js | @@ -17,5 +17,5 @@
var S3Publisher = require('ember-publisher');
var configPath = require('path').join(__dirname, '../config/s3ProjectConfig.js');
-publisher = new S3Publisher({projectConfigPath: configPath});
+var publisher = new S3Publisher({projectConfigPath: configPath});
publisher.publish(); | true |
Other | emberjs | ember.js | 87df91f451456550894f7e7101fce76ff950b2c0.json | Avoid global variable leak in script files | config/s3ProjectConfig.js | @@ -1,4 +1,4 @@
-fileMap = function(revision,tag,date) {
+function fileMap(revision,tag,date) {
return {
"ember.js": fileObject("ember", ".js", "text/javascript", revision, tag, date),
"ember.debug.js": fileObject("ember.debug", ".js", "text/javascript", revision, tag, date), | true |
Other | emberjs | ember.js | 27dac7bffd707ec25bba9a8b98cdeb937f518b10.json | Add CommonJS build of Ember | Brocfile.js | @@ -650,6 +650,7 @@ var deprecatedDebugFile = replace(compiledSource, {
{ match: /var runningNonEmberDebugJS = false;/, replacement: 'var runningNonEmberDebugJS = true;'}
]
});
+
deprecatedDebugFile = concat(deprecatedDebugFile, {
inputFiles: [ 'ember.debug.js' ],
outputFile: '/ember.js'
@@ -694,6 +695,26 @@ function buildRuntimeTree() {
});
}
+function buildCJSTree() {
+ var compiledSource = concatES6(devSourceTrees, {
+ es3Safe: env !== 'development',
+ derequire: env !== 'development',
+ includeLoader: true,
+ bootstrapModule: 'ember',
+ vendorTrees: vendorTrees,
+ inputFiles: ['**/*.js'],
+ destFile: '/ember.debug.cjs.js'
+ });
+
+ var exportsTree = writeFile('export-ember', ';module.exports = Ember;\n');
+
+ return concat(mergeTrees([compiledSource, exportsTree]), {
+ wrapInEval: false,
+ inputFiles: ['ember.debug.cjs.js', 'export-ember'],
+ outputFile: '/ember.debug.cjs.js'
+ });
+}
+
// Generates prod build. defeatureify increases the overall runtime speed of ember.js by
// ~10%. See defeatureify.
var prodCompiledSource = concatES6(prodSourceTrees, {
@@ -767,6 +788,7 @@ if (env !== 'development') {
distTrees.push(minCompiledSource);
}
distTrees.push(buildRuntimeTree());
+ distTrees.push(buildCJSTree());
}
// merge distTrees and sub out version placeholders for distribution | true |
Other | emberjs | ember.js | 27dac7bffd707ec25bba9a8b98cdeb937f518b10.json | Add CommonJS build of Ember | bin/run-node-tests.js | @@ -0,0 +1,22 @@
+#!/usr/bin/env node
+
+require('qunitjs');
+
+// adds test reporting
+var qe = require('qunit-extras');
+qe.runInContext(global);
+
+var glob = require('glob');
+var root = 'tests/';
+
+function addFiles(files) {
+ glob.sync(root + files)
+ .map(function(name) {
+ return "../" + name.substring(0, name.length - 3);
+ })
+ .forEach(require);
+}
+
+addFiles('/**/*-test.js');
+
+QUnit.load(); | true |
Other | emberjs | ember.js | 27dac7bffd707ec25bba9a8b98cdeb937f518b10.json | Add CommonJS build of Ember | tests/node/app-boot-test.js | @@ -6,7 +6,7 @@ var distPath = path.join(__dirname, '../../dist');
QUnit.module("App boot");
QUnit.test("App is created without throwing an exception", function() {
- var Ember = require(path.join(distPath, 'ember.debug'));
+ var Ember = require(path.join(distPath, 'ember.debug.cjs'));
var App = Ember.Application.create({
}); | true |
Other | emberjs | ember.js | b8cefb05fd489531958317e312d16c78117ba69c.json | Add tests for node compatibility | .travis.yml | @@ -39,3 +39,4 @@ env:
- TEST_SUITE=built-tests
- TEST_SUITE=old-jquery
- TEST_SUITE=extend-prototypes
+ - TEST_SUITE=node | true |
Other | emberjs | ember.js | b8cefb05fd489531958317e312d16c78117ba69c.json | Add tests for node compatibility | bin/run-tests.js | @@ -135,6 +135,9 @@ switch (process.env.TEST_SUITE) {
generateExtendPrototypeTests();
generateEachPackageTests();
break;
+ case 'node':
+ require('./run-node-tests');
+ return;
default:
generateEachPackageTests();
} | true |
Other | emberjs | ember.js | b8cefb05fd489531958317e312d16c78117ba69c.json | Add tests for node compatibility | package.json | @@ -41,6 +41,8 @@
"git-repo-version": "0.0.1",
"glob": "~3.2.8",
"htmlbars": "0.5.0",
- "rsvp": "~3.0.6"
+ "rsvp": "~3.0.6",
+ "qunit-extras": "^1.3.0",
+ "qunitjs": "^1.16.0"
}
} | true |
Other | emberjs | ember.js | b8cefb05fd489531958317e312d16c78117ba69c.json | Add tests for node compatibility | tests/node/app-boot-test.js | @@ -0,0 +1,21 @@
+/*globals __dirname*/
+
+var path = require('path');
+var distPath = path.join(__dirname, '../../dist');
+
+QUnit.module("App boot");
+
+QUnit.test("App is created without throwing an exception", function() {
+ var Ember = require(path.join(distPath, 'ember.debug'));
+
+ var App = Ember.Application.create({
+ });
+
+ App.Router = Ember.Router.extend({
+ location: 'none'
+ });
+
+ App.advanceReadiness();
+
+ QUnit.ok(App);
+}); | true |
Other | emberjs | ember.js | b8cefb05fd489531958317e312d16c78117ba69c.json | Add tests for node compatibility | tests/node/runtime-test.js | @@ -0,0 +1,38 @@
+/*globals __dirname*/
+
+var path = require('path');
+
+var module = QUnit.module;
+var ok = QUnit.ok;
+var equal = QUnit.equal;
+
+var distPath = path.join(__dirname, '../../dist');
+
+module('ember-runtime.js');
+
+test('can be required', function() {
+ var Ember = require(path.join(distPath, 'ember-runtime'));
+
+ ok(Ember.Object, 'Ember.Object is present');
+});
+
+test('basic object system functions properly', function() {
+ var Ember = require(path.join(distPath, 'ember-runtime'));
+
+ var Person = Ember.Object.extend({
+ name: Ember.computed('firstName', 'lastName', function() {
+ return this.get('firstName') + ' ' + this.get('lastName');
+ })
+ });
+
+ var person = Person.create({
+ firstName: 'Max',
+ lastName: 'Jackson'
+ });
+
+ equal(person.get('name'), 'Max Jackson');
+
+ person.set('firstName', 'James');
+
+ equal(person.get('name'), 'James Jackson');
+}); | true |
Other | emberjs | ember.js | 5395ccb5021c7509725cbe4b294a2b964fea7b54.json | fix documentation for run.later | packages/ember-metal/lib/run_loop.js | @@ -312,7 +312,7 @@ run.sync = function() {
target at the time the method is invoked.
@param {Object} [args*] Optional arguments to pass to the timeout.
@param {Number} wait Number of milliseconds to wait.
- @return {Object} Timer information for use in cancelling, see `run.cancel`.
+ @return {*} Timer information for use in cancelling, see `run.cancel`.
*/
run.later = function(/*target, method*/) {
return backburner.later.apply(backburner, arguments); | false |
Other | emberjs | ember.js | 5cf25f10c905b4f7db98589c72cc63f82a411da9.json | Use boolean naming conventions. | packages/ember-metal/lib/computed_macros.js | @@ -49,16 +49,16 @@ function registerComputedWithProperties(name, macro) {
```javascript
var ToDoList = Ember.Object.extend({
- done: Ember.computed.empty('todos')
+ isDone: Ember.computed.empty('todos')
});
var todoList = ToDoList.create({
todos: ['Unit Test', 'Documentation', 'Release']
});
- todoList.get('done'); // false
+ todoList.get('isDone'); // false
todoList.get('todos').clear();
- todoList.get('done'); // true
+ todoList.get('isDone'); // true
```
@since 1.6.0 | false |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | Brocfile.js | @@ -43,7 +43,6 @@ if (process.env.DEFEATUREIFY === 'true') {
disableDefeatureify = env === 'development';
}
-var generateTemplateCompiler = require('./lib/broccoli-ember-template-compiler-generator');
var inlineTemplatePrecompiler = require('./lib/broccoli-ember-inline-template-precompiler');
/*
@@ -265,7 +264,6 @@ s3TestRunner = replace(s3TestRunner, {
{ match: new RegExp('../ember', 'g'), replacement: './ember' },
{ match: new RegExp('../qunit/qunit.css', 'g'), replacement: 'http://code.jquery.com/qunit/qunit-1.15.0.css' },
{ match: new RegExp('../qunit/qunit.js', 'g'), replacement: 'http://code.jquery.com/qunit/qunit-1.15.0.js' },
- { match: new RegExp('../handlebars/handlebars.js', 'g'), replacement: 'http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v2.0.0.js' },
{ match: new RegExp('../jquery/jquery.js', 'g'), replacement: 'http://code.jquery.com/jquery-1.11.1.js'}
]
});
@@ -309,12 +307,6 @@ var bowerFiles = [
files: ['jquery.js'],
srcDir: '/',
destDir: '/jquery'
- }),
-
- pickFiles('bower_components/handlebars', {
- files: ['handlebars.js'],
- srcDir: '/',
- destDir: '/handlebars'
})
];
@@ -341,11 +333,6 @@ var iifeStop = writeFile('iife-stop', '})();');
'ember-metal': {trees: null, vendorRequirements: ['backburner']}
```
*/
-var handlebarsConfig = {
- libPath: 'node_modules/handlebars/dist',
- mainFile: 'handlebars.amd.js'
-};
-
var vendoredPackages = {
'loader': vendoredPackage('loader'),
'rsvp': vendoredEs6Package('rsvp'),
@@ -359,16 +346,8 @@ var vendoredPackages = {
'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer'),
'htmlbars-test-helpers': htmlbarsPackage('htmlbars-test-helpers', { singleFile: true } ),
'htmlbars-util': htmlbarsPackage('htmlbars-util'),
- 'handlebars': vendoredPackage('handlebars', handlebarsConfig)
};
-var emberHandlebarsCompiler = pickFiles('packages/ember-handlebars-compiler/lib', {
- files: ['main.js'],
- srcDir: '/',
- destDir: '/'
-});
-var templateCompilerTree = generateTemplateCompiler(emberHandlebarsCompiler, { srcFile: 'main.js'});
-
var packages = require('./lib/packages');
function es6Package(packageName) {
@@ -462,24 +441,11 @@ function es6Package(packageName) {
if (pkg.hasTemplates) {
/*
- Add templateCompiler to libTree. This is done to ensure that the templates
- are precompiled with the local version of `ember-handlebars-compiler` (NOT
- the `npm` version), and includes any changes. Specifically, so that you
- can work on the template compiler and still have functional builds.
- */
- libTree = mergeTrees([libTree, templateCompilerTree]);
-
- /*
- Utilizing the templateCompiler to compile inline handlebars templates to
- handlebar template functions. This is done so that only Handlebars runtime
- is required instead of all of Handlebars.
+ Utilizing the templateCompiler to compile inline templates to
+ template functions. This is done so that HTMLBars compiler is
+ not required for running Ember.
*/
libTree = inlineTemplatePrecompiler(libTree);
-
- // Remove templateCompiler from libTree as it is no longer needed.
- libTree = removeFile(libTree, {
- srcFile: 'ember-template-compiler.js'
- });
}
var testTree = pickFiles('packages/' + packageName + '/tests', {
@@ -798,7 +764,7 @@ var prodCompiledTests = concatES6(testTrees, {
}
});
-var distTrees = [templateCompilerTree, compiledSource, compiledTests, testingCompiledSource, testConfig, bowerFiles];
+var distTrees = [compiledSource, compiledTests, testingCompiledSource, testConfig, bowerFiles];
// If you are not running in dev add Production and Minify build to distTrees.
// This ensures development build speed is not affected by unnecessary | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | lib/broccoli-ember-inline-template-precompiler.js | @@ -19,11 +19,11 @@ EmberTemplatePrecompiler.prototype.extensions = ['hbs'];
EmberTemplatePrecompiler.prototype.targetExtension = 'js';
EmberTemplatePrecompiler.prototype.processString = function(content, relativePath) {
- var handlebarsCompilerPath = path.join(this._srcDir, this.handlebarsCompilerPath);
- var handlebarsCompiler = require(path.resolve(handlebarsCompilerPath));
-
var template;
if (relativePath.match(/handlebars/)) {
+ var handlebarsCompilerPath = path.join(this._srcDir, this.handlebarsCompilerPath);
+ var handlebarsCompiler = require(path.resolve(handlebarsCompilerPath));
+
template = 'import EmberHandlebars from "ember-handlebars-compiler";\n';
template += "export default EmberHandlebars.template(" + handlebarsCompiler.precompile(content, false) + ");";
} else if (relativePath.match(/htmlbars/)) { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | lib/packages.js | @@ -7,12 +7,9 @@ module.exports = {
'ember-views': {trees: null, requirements: ['ember-runtime', 'ember-metal-views']},
'ember-extension-support': {trees: null, requirements: ['ember-application']},
'ember-testing': {trees: null, requirements: ['ember-application', 'ember-routing'], developmentOnly: true},
- 'ember-handlebars-compiler': {trees: null, requirements: ['ember-views']},
- 'ember-handlebars': {trees: null, requirements: ['ember-views', 'ember-handlebars-compiler'], hasTemplates: true},
- 'ember-htmlbars': {trees: null, vendorRequirements: ['handlebars', 'simple-html-tokenizer', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers'], requirements: ['ember-metal-views'], hasTemplates: true},
+ 'ember-htmlbars': {trees: null, vendorRequirements: ['simple-html-tokenizer', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers'], requirements: ['ember-metal-views'], hasTemplates: true},
'ember-routing': {trees: null, vendorRequirements: ['router', 'route-recognizer'],
requirements: ['ember-runtime', 'ember-views']},
- 'ember-routing-handlebars': {trees: null, requirements: ['ember-routing', 'ember-handlebars']},
'ember-routing-htmlbars': {trees: null, requirements: ['ember-routing', 'ember-htmlbars']},
'ember-routing-views': {trees: null, requirements: ['ember-routing']},
'ember-application': {trees: null, vendorRequirements: ['dag-map'], requirements: ['ember-routing']}, | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | package.json | @@ -41,10 +41,7 @@
"express": "^4.5.0",
"git-repo-version": "0.0.1",
"glob": "~3.2.8",
- "handlebars": "^2.0",
- "htmlbars": "0.4.0",
- "ncp": "~0.5.1",
- "rimraf": "~2.2.8",
+ "htmlbars": "0.4.1",
"rsvp": "~3.0.6"
}
} | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-application/lib/system/application.js | @@ -41,7 +41,6 @@ import ContainerDebugAdapter from "ember-extension-support/container_debug_adapt
import {
K
} from 'ember-metal/core';
-import EmberHandlebars from "ember-handlebars-compiler";
function props(obj) {
var properties = [];
@@ -277,7 +276,6 @@ var Application = Namespace.extend(DeferredMixin, {
if (!librariesRegistered) {
librariesRegistered = true;
- Ember.libraries.registerCoreLibrary('Handlebars' + (EmberHandlebars.compile ? '' : '-runtime'), EmberHandlebars.VERSION);
Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
}
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-application/lib/system/resolver.js | @@ -13,7 +13,7 @@ import {
} from 'ember-runtime/system/string';
import EmberObject from 'ember-runtime/system/object';
import Namespace from 'ember-runtime/system/namespace';
-import EmberHandlebars from 'ember-handlebars';
+import helpers from 'ember-htmlbars/helpers';
export var Resolver = EmberObject.extend({
/**
@@ -350,7 +350,7 @@ export default EmberObject.extend({
@method resolveHelper
*/
resolveHelper: function(parsedName) {
- return this.resolveOther(parsedName) || EmberHandlebars.helpers[parsedName.fullNameWithoutType];
+ return this.resolveOther(parsedName) || helpers[parsedName.fullNameWithoutType];
},
/**
Look up the specified object (from parsedName) on the appropriate | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-application/tests/system/application_test.js | @@ -8,17 +8,14 @@ import Router from "ember-routing/system/router";
import View from "ember-views/views/view";
import Controller from "ember-runtime/controllers/controller";
import NoneLocation from "ember-routing/location/none_location";
-import EmberHandlebars from "ember-handlebars";
import EmberObject from "ember-runtime/system/object";
import jQuery from "ember-views/system/jquery";
+import compile from "ember-htmlbars/system/compile";
var trim = jQuery.trim;
var app, application, originalLookup, originalDebug;
-var compile = EmberHandlebars.compile;
-
-
QUnit.module("Ember.Application", {
setup: function() {
originalLookup = Ember.lookup;
@@ -229,10 +226,9 @@ test('enable log of libraries with an ENV var', function() {
});
});
- equal(messages[1], "Ember : " + Ember.VERSION);
- equal(messages[2], "Handlebars : " + EmberHandlebars.VERSION);
- equal(messages[3], "jQuery : " + jQuery().jquery);
- equal(messages[4], "my-lib : " + "2.0.0a");
+ equal(messages[1], "Ember : " + Ember.VERSION);
+ equal(messages[2], "jQuery : " + jQuery().jquery);
+ equal(messages[3], "my-lib : " + "2.0.0a");
Ember.libraries.deRegister("my-lib");
Ember.LOG_VERSION = false; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-application/tests/system/dependency_injection/default_resolver_test.js | @@ -3,15 +3,11 @@ import run from "ember-metal/run_loop";
import Logger from "ember-metal/logger";
import Controller from "ember-runtime/controllers/controller";
import EmberObject from "ember-runtime/system/object";
-import EmberHandlebars from "ember-handlebars";
import Namespace from "ember-runtime/system/namespace";
import Application from "ember-application/system/application";
-
-var compile, registerHelper;
-compile = EmberHandlebars.compile;
-registerHelper = function(name, fn) {
- EmberHandlebars.registerHelper(name, fn);
-};
+import {
+ registerHelper
+} from "ember-htmlbars/helpers";
var locator, application, originalLookup, originalLoggerInfo;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/lib/compat.js | @@ -1,4 +1,4 @@
-import EmberHandlebars from "ember-handlebars";
+import Ember from "ember-metal/core";
import helpers from "ember-htmlbars/helpers";
import template from "ember-htmlbars/system/template";
import compile from "ember-htmlbars/system/compile";
@@ -12,7 +12,9 @@ import compatRegisterBoundHelper from "ember-htmlbars/compat/register-bound-help
import compatPrecompile from "ember-htmlbars/compat/precompile";
import makeViewHelper from "ember-htmlbars/system/make-view-helper";
+var EmberHandlebars;
if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
+ EmberHandlebars = Ember.Handlebars = { };
EmberHandlebars.helpers = helpers;
EmberHandlebars.helper = compatHandlebarsHelper;
EmberHandlebars.registerHelper = compatRegisterHelper; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/lib/helpers/collection.js | @@ -4,8 +4,6 @@
*/
import Ember from "ember-metal/core"; // Ember.assert, Ember.deprecate
-import EmberHandlebars from "ember-handlebars-compiler";
-
import { IS_BINDING } from "ember-metal/mixin";
import { fmt } from "ember-runtime/system/string";
import { get } from "ember-metal/property_get";
@@ -219,7 +217,7 @@ export function collectionHelper(params, hash, options, env) {
}
var emptyViewClass;
- if (inverse && inverse !== EmberHandlebars.VM.noop) {
+ if (inverse) {
emptyViewClass = get(collectionPrototype, 'emptyViewClass');
emptyViewClass = emptyViewClass.extend({
template: inverse, | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/lib/utils/string.js | @@ -4,7 +4,10 @@
*/
// required so we can extend this object.
-import SafeString from "htmlbars-util/safe-string";
+import {
+ SafeString,
+ escapeExpression
+} from "htmlbars-util";
import EmberStringUtils from "ember-runtime/system/string";
/**
@@ -53,4 +56,8 @@ if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
};
}
-export { SafeString, htmlSafe };
+export {
+ SafeString,
+ htmlSafe,
+ escapeExpression
+}; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/compat/make-view-helper_test.js | @@ -1,20 +1,13 @@
import EmberView from "ember-views/views/view";
import Container from 'container/container';
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
+import makeViewHelper from "ember-htmlbars/system/make-view-helper";
import Component from "ember-views/views/component";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var container, view;
-QUnit.module('ember-htmlbars: Ember.Handlebars.makeViewHelper compat', {
+QUnit.module('ember-htmlbars: makeViewHelper compat', {
setup: function() {
container = new Container();
container.optionsForType('helper', { instantiate: false });
@@ -26,13 +19,13 @@ QUnit.module('ember-htmlbars: Ember.Handlebars.makeViewHelper compat', {
}
});
-test('EmberHandlebars.makeViewHelper', function() {
+test('makeViewHelper', function() {
expect(1);
var ViewHelperComponent = Component.extend({
layout: compile('woot!')
});
- var helper = EmberHandlebars.makeViewHelper(ViewHelperComponent);
+ var helper = makeViewHelper(ViewHelperComponent);
container.register('helper:view-helper', helper);
view = EmberView.extend({ | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/compat/precompile_test.js | @@ -1,4 +1,5 @@
-import EmberHandlebars from "ember-handlebars-compiler";
+import EmberHandlebars from "ember-htmlbars/compat";
+
var precompile = EmberHandlebars.precompile;
var parse = EmberHandlebars.parse;
var template = 'Hello World'; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helper_test.js | @@ -1,26 +1,14 @@
import EmberView from "ember-views/views/view";
import run from "ember-metal/run_loop";
import EmberObject from "ember-runtime/system/object";
-import EmberHandlebars from "ember-handlebars-compiler";
import { set } from "ember-metal/property_set";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
import {
- default as htmlbarsHelpers,
- helper as htmlbarsHelper
+ default as helpers,
+ helper
} from "ember-htmlbars/helpers";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-
-var compile, helper, helpers;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
- helpers = htmlbarsHelpers;
- helper = htmlbarsHelper;
-} else {
- compile = EmberHandlebars.compile;
- helper = EmberHandlebars.helper;
- helpers = EmberHandlebars.helpers;
-}
+import compile from "ember-htmlbars/system/compile";
var view;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/bind_attr_test.js | @@ -4,7 +4,6 @@ import run from "ember-metal/run_loop";
import Namespace from "ember-runtime/system/namespace";
import EmberView from "ember-views/views/view";
import _MetamorphView from "ember-views/views/metamorph_view";
-import EmberHandlebars from "ember-handlebars";
import EmberObject from "ember-runtime/system/object";
import { A } from "ember-runtime/system/native_array";
import { computed } from "ember-metal/computed";
@@ -13,19 +12,8 @@ import Container from "ember-runtime/system/container";
import { set } from "ember-metal/property_set";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-import {
- default as htmlbarsHelpers
-} from "ember-htmlbars/helpers";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-
-var compile, helpers;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
- helpers = htmlbarsHelpers;
-} else {
- compile = EmberHandlebars.compile;
- helpers = EmberHandlebars.helpers;
-}
+import helpers from "ember-htmlbars/helpers";
+import compile from "ember-htmlbars/system/compile";
var view;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/bind_test.js | @@ -2,8 +2,7 @@ import EmberView from "ember-views/views/view";
import EmberObject from "ember-runtime/system/object";
import run from "ember-metal/run_loop";
import _MetamorphView from 'ember-views/views/metamorph_view';
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import Container from "ember-runtime/system/container";
import ObjectController from "ember-runtime/controllers/object_controller";
@@ -13,13 +12,6 @@ import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var view, container;
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module("ember-htmlbars: {{bind}} helper", {
setup: function() {
container = new Container(); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/collection_test.js | @@ -2,7 +2,6 @@
import CollectionView from "ember-views/views/collection_view";
import EmberObject from "ember-runtime/system/object";
import EmberView from "ember-views/views/view";
-import EmberHandlebars from "ember-handlebars";
import ArrayProxy from "ember-runtime/system/array_proxy";
import Namespace from "ember-runtime/system/namespace";
import Container from "ember-runtime/system/container";
@@ -13,16 +12,10 @@ import { set } from "ember-metal/property_set";
import jQuery from "ember-views/system/jquery";
import { computed } from "ember-metal/computed";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
+import compile from "ember-htmlbars/system/compile";
var trim = jQuery.trim;
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
var view;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/debug_test.js | @@ -1,18 +1,10 @@
import Ember from "ember-metal/core"; // Ember.lookup
import EmberLogger from "ember-metal/logger";
import EmberView from "ember-views/views/view";
-import EmberHandlebars from "ember-handlebars-compiler";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var originalLookup = Ember.lookup;
var lookup;
var originalLog, logCalls; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/each_test.js | @@ -6,8 +6,6 @@ import EmberView from "ember-views/views/view";
import _MetamorphView from "ember-views/views/metamorph_view";
import { computed } from "ember-metal/computed";
import ArrayController from "ember-runtime/controllers/array_controller";
-import EmberHandlebars from "ember-handlebars-compiler";
-// import {expectAssertion} from "ember-metal/tests/debug_helpers";
import { A } from "ember-runtime/system/native_array";
import { default as EmberController } from "ember-runtime/controllers/controller";
import ObjectController from "ember-runtime/controllers/object_controller";
@@ -17,13 +15,7 @@ import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
+import compile from "ember-htmlbars/system/compile";
var people, view, container;
var template, templateMyView, MyView;
@@ -144,18 +136,20 @@ test("it updates the view if an item is added", function() {
assertHTML(view, "Steve HoltAnnabelleTom Dale");
});
-test("should be able to use standard Handlebars #each helper", function() {
- runDestroy(view);
+if (typeof Handlebars === "object") {
+ test("should be able to use standard Handlebars #each helper", function() {
+ runDestroy(view);
- view = EmberView.create({
- context: { items: ['a', 'b', 'c'] },
- template: Handlebars.compile("{{#each items}}{{this}}{{/each}}")
- });
+ view = EmberView.create({
+ context: { items: ['a', 'b', 'c'] },
+ template: Handlebars.compile("{{#each items}}{{this}}{{/each}}")
+ });
- runAppend(view);
+ runAppend(view);
- equal(view.$().html(), "abc");
-});
+ equal(view.$().html(), "abc");
+ });
+}
test("it allows you to access the current context using {{this}}", function() {
runDestroy(view); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/if_unless_test.js | @@ -5,22 +5,14 @@ import EmberView from "ember-views/views/view";
import ObjectProxy from "ember-runtime/system/object_proxy";
import EmberObject from "ember-runtime/system/object";
import _MetamorphView from 'ember-views/views/metamorph_view';
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { set } from 'ember-metal/property_set';
import { fmt } from 'ember-runtime/system/string';
import { typeOf } from 'ember-metal/utils';
import { forEach } from 'ember-metal/enumerable_utils';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var originalLookup = Ember.lookup;
var view, lookup, container, TemplateTests; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/input_test.js | @@ -2,16 +2,7 @@ import run from "ember-metal/run_loop";
import { set } from "ember-metal/property_set";
import View from "ember-views/views/view";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
+import compile from "ember-htmlbars/system/compile";
var view;
var controller; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/loc_test.js | @@ -1,15 +1,7 @@
import EmberView from 'ember-views/views/view';
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
function buildView(template, context) {
return EmberView.create({
template: compile(template), | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/log_test.js | @@ -1,17 +1,10 @@
import Ember from 'ember-metal/core';
import EmberView from 'ember-views/views/view';
-import EmberHandlebars from 'ember-handlebars';
-import htmlbarsCompile from 'ember-htmlbars/system/compile';
+import compile from 'ember-htmlbars/system/compile';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var originalLookup, originalLog, logCalls, lookup, view, compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module('ember-htmlbars: {{#log}} helper', {
setup: function() {
Ember.lookup = lookup = { Ember: Ember }; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/partial_test.js | @@ -4,20 +4,12 @@ import EmberView from "ember-views/views/view";
import jQuery from "ember-views/system/jquery";
var trim = jQuery.trim;
import Container from "ember-runtime/system/container";
-import EmberHandlebars from "ember-handlebars-compiler";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var MyApp, lookup, view, container;
var originalLookup = Ember.lookup;
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module("Support for {{partial}} helper", {
setup: function() {
Ember.lookup = lookup = { Ember: Ember }; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/template_test.js | @@ -4,20 +4,12 @@ import jQuery from "ember-views/system/jquery";
var trim = jQuery.trim;
import Container from "ember-runtime/system/container";
-import EmberHandlebars from "ember-handlebars-compiler";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var MyApp, lookup, view, container;
var originalLookup = Ember.lookup;
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module("Support for {{template}} helper", {
setup: function() {
Ember.lookup = lookup = { Ember: Ember }; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/text_area_test.js | @@ -1,17 +1,9 @@
import run from "ember-metal/run_loop";
import View from "ember-views/views/view";
-import EmberHandlebars from "ember-htmlbars/compat";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { set as o_set } from "ember-metal/property_set";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var textArea, controller;
function set(object, key, value) { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/unbound_test.js | @@ -7,36 +7,15 @@ import Ember from 'ember-metal/core';
import { get } from 'ember-metal/property_get';
import { set } from 'ember-metal/property_set';
import run from 'ember-metal/run_loop';
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import EmberError from 'ember-metal/error';
-import {
- default as htmlbarsHelpers
-} from "ember-htmlbars/helpers";
-import registerHTMLBarsHelper from "ember-htmlbars/compat/register-bound-helper";
-import htmlbarsMakeBoundHelper from "ember-htmlbars/compat/make-bound-helper";
+import helpers from "ember-htmlbars/helpers";
+import registerBoundHelper from "ember-htmlbars/compat/register-bound-helper";
+import makeBoundHelper from "ember-htmlbars/compat/make-bound-helper";
import Container from 'ember-runtime/system/container';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-import {
- makeBoundHelper as handlebarsMakeBoundHelper
-} from 'ember-handlebars/ext';
-import htmlbarsMakeBoundHelper from "ember-htmlbars/compat/make-bound-helper";
-
-var compile, helpers, registerBoundHelper, makeBoundHelper;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
- registerBoundHelper = registerHTMLBarsHelper;
- makeBoundHelper = htmlbarsMakeBoundHelper;
- helpers = htmlbarsHelpers;
-} else {
- compile = EmberHandlebars.compile;
- registerBoundHelper = EmberHandlebars.registerBoundHelper;
- helpers = EmberHandlebars.helpers;
- makeBoundHelper = handlebarsMakeBoundHelper;
-}
-
function expectDeprecationInHTMLBars() {
// leave this as an empty function until we are ready to use it
// to enforce deprecation notice for old Handlebars versions | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/view_test.js | @@ -9,11 +9,10 @@ import Namespace from 'ember-runtime/system/namespace';
import EmberObject from 'ember-runtime/system/object';
import ContainerView from 'ember-views/views/container_view';
import _MetamorphView from 'ember-views/views/metamorph_view';
-import HTMLBarsSafeString from 'htmlbars-util/safe-string';
-import htmlbarsPrecompile from 'ember-htmlbars/compat/precompile';
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-import htmlbarsTemplate from 'ember-htmlbars/system/template';
+import SafeString from 'htmlbars-util/safe-string';
+import precompile from 'ember-htmlbars/compat/precompile';
+import compile from "ember-htmlbars/system/compile";
+import template from 'ember-htmlbars/system/template';
import { observersFor } from "ember-metal/observer";
import ObjectController from 'ember-runtime/controllers/object_controller';
@@ -22,19 +21,6 @@ import { set } from 'ember-metal/property_set';
import { get } from 'ember-metal/property_get';
import { computed } from 'ember-metal/computed';
-var compile, SafeString, precompile, template;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
- template = htmlbarsTemplate;
- precompile = htmlbarsPrecompile;
- SafeString = HTMLBarsSafeString;
-} else {
- compile = EmberHandlebars.compile;
- template = EmberHandlebars.template;
- precompile = EmberHandlebars.precompile;
- SafeString = EmberHandlebars.SafeString;
-}
-
var view, originalLookup, container, lookup;
var trim = jQuery.trim;
@@ -1135,7 +1121,7 @@ test('should expose a controller keyword that persists through Ember.ContainerVi
var containerView = get(view, 'childViews.firstObject');
var viewInstanceToBeInserted = EmberView.create({
- template: EmberHandlebars.compile('{{controller.foo}}')
+ template: compile('{{controller.foo}}')
});
run(function() {
@@ -1212,7 +1198,7 @@ test('bindings should respect keywords', function() {
test('should bind to the property if no registered helper found for a mustache without parameters', function() {
view = EmberView.createWithMixins({
- template: EmberHandlebars.compile('{{view.foobarProperty}}'),
+ template: compile('{{view.foobarProperty}}'),
foobarProperty: computed(function() {
return 'foobarProperty';
}) | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/with_test.js | @@ -7,18 +7,9 @@ import { set } from "ember-metal/property_set";
import { get } from "ember-metal/property_get";
import ObjectController from "ember-runtime/controllers/object_controller";
import Container from "ember-runtime/system/container";
-// import { A } from "ember-runtime/system/native_array";
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var view, lookup;
var originalLookup = Ember.lookup;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/helpers/yield_test.js | @@ -9,23 +9,13 @@ import { A } from "ember-runtime/system/native_array";
import Component from "ember-views/views/component";
import EmberError from "ember-metal/error";
import {
- helper as htmlbarsHelper,
+ helper,
default as helpers
} from "ember-htmlbars/helpers";
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile, helper;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
- helper = htmlbarsHelper;
-} else {
- compile = EmberHandlebars.compile;
- helper = EmberHandlebars.helper;
-}
-
var view, container;
QUnit.module("ember-htmlbars: Support for {{yield}} helper", { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/integration/binding_integration_test.js | @@ -5,24 +5,17 @@ import { Binding } from 'ember-metal/binding';
import EmberObject from 'ember-runtime/system/object';
import { computed } from 'ember-metal/computed';
import ContainerView from 'ember-views/views/container_view';
-import htmlbarsCompile from 'ember-htmlbars/system/compile';
-import EmberHandlebars from "ember-handlebars";
-import { ViewHelper as handlebarsViewHelper } from 'ember-handlebars/helpers/view';
-import { ViewHelper as htmlbarsViewHelper } from 'ember-htmlbars/helpers/view';
+import compile from 'ember-htmlbars/system/compile';
+import { ViewHelper } from 'ember-htmlbars/helpers/view';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
+import { registerHelper } from "ember-htmlbars/helpers";
import { set } from 'ember-metal/property_set';
var compile, view, MyApp, originalLookup, lookup;
var trim = jQuery.trim;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module('ember-htmlbars: binding integration', {
setup: function() {
originalLookup = Ember.lookup;
@@ -42,7 +35,7 @@ QUnit.module('ember-htmlbars: binding integration', {
});
test('should call a registered helper for mustache without parameters', function() {
- EmberHandlebars.registerHelper('foobar', function() {
+ registerHelper('foobar', function() {
return 'foobar';
});
@@ -166,17 +159,12 @@ test('should accept bindings as a string or an Ember.Binding', function() {
template: compile('binding: {{view.bindingTest}}, string: {{view.stringTest}}')
});
- EmberHandlebars.registerHelper('boogie', function(id, options) {
- options.hash = options.hash || {};
- options.hash.bindingTestBinding = Binding.oneWay('context.' + id);
- options.hash.stringTestBinding = id;
+ registerHelper('boogie', function(params, hash, options, env) {
+ var id = params[0];
+ hash.bindingTestBinding = Binding.oneWay('context.' + id._label);
+ hash.stringTestBinding = id;
- var result;
- if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- result = htmlbarsViewHelper.helper(viewClass, options.hash, options, options);
- } else {
- result = handlebarsViewHelper.helper(this, viewClass, options);
- }
+ var result = ViewHelper.helper(viewClass, hash, options, env);
return result;
}); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/integration/component_invocation_test.js | @@ -1,18 +1,10 @@
import EmberView from "ember-views/views/view";
import Container from 'container/container';
import jQuery from "ember-views/system/jquery";
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import ComponentLookup from 'ember-views/component_lookup';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var container, view;
QUnit.module('component - invocation', { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/integration/escape_integration_test.js | @@ -1,21 +1,13 @@
import run from 'ember-metal/run_loop';
-import Ember from 'ember-metal/core';
import EmberView from 'ember-views/views/view';
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from 'ember-htmlbars/system/compile';
+import compile from 'ember-htmlbars/system/compile';
import { set } from 'ember-metal/property_set';
import { create as o_create } from 'ember-metal/platform';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var compile, view;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module('ember-htmlbars: Integration with Globals', {
teardown: function() {
runDestroy(view); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/integration/globals_integration_test.js | @@ -1,17 +1,10 @@
import Ember from 'ember-metal/core';
import EmberView from 'ember-views/views/view';
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from 'ember-htmlbars/system/compile';
+import compile from 'ember-htmlbars/system/compile';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var compile, view, originalLookup, lookup;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var originalLookup = Ember.lookup;
QUnit.module('ember-htmlbars: Integration with Globals', { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/integration/select_in_template_test.js | @@ -8,19 +8,11 @@ import Namespace from "ember-runtime/system/namespace";
import ArrayController from "ember-runtime/controllers/array_controller";
import ArrayProxy from "ember-runtime/system/array_proxy";
import SelectView from "ember-views/views/select";
-import EmberHandlebars from 'ember-handlebars-compiler';
-import { default as htmlbarsCompile } from 'ember-htmlbars/system/compile';
+import compile from 'ember-htmlbars/system/compile';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
var dispatcher, view;
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module("ember-htmlbars: Ember.Select - usage inside templates", {
setup: function() {
dispatcher = EventDispatcher.create(); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/integration/with_view_test.js | @@ -1,27 +1,17 @@
import run from 'ember-metal/run_loop';
-import Ember from 'ember-metal/core';
import jQuery from 'ember-views/system/jquery';
import EmberView from 'ember-views/views/view';
import Container from 'ember-runtime/system/container';
import EmberObject from 'ember-runtime/system/object';
import _MetamorphView from 'ember-views/views/metamorph_view';
-import EmberHandlebars from 'ember-handlebars';
-import htmlbarsCompile from 'ember-htmlbars/system/compile';
+import compile from 'ember-htmlbars/system/compile';
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
import { set } from 'ember-metal/property_set';
var view, container;
-
var trim = jQuery.trim;
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
QUnit.module('ember-htmlbars: {{#with}} and {{#view}} integration', {
setup: function() {
container = new Container();
@@ -101,7 +91,7 @@ test('bindings can be `this`, in which case they *are* the current context [DEPR
}),
- template: EmberHandlebars.compile('{{#if view.museumOpen}} {{#with view.museumDetails}}{{view museumView museum=this}} {{/with}}{{/if}}')
+ template: compile('{{#if view.museumOpen}} {{#with view.museumDetails}}{{view museumView museum=this}} {{/with}}{{/if}}')
});
expectDeprecation(function() { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-htmlbars/tests/system/bootstrap_test.js | @@ -2,6 +2,7 @@ import jQuery from "ember-views/system/jquery";
import run from "ember-metal/run_loop";
import EmberView from "ember-views/views/view";
import { runDestroy } from "ember-runtime/tests/utils";
+import bootstrap from "ember-htmlbars/system/bootstrap";
var trim = jQuery.trim;
@@ -22,7 +23,7 @@ QUnit.module("ember-htmlbars: bootstrap", {
function checkTemplate(templateName) {
run(function() {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
+ bootstrap(jQuery('#qunit-fixture'));
});
var template = Ember.TEMPLATES[templateName];
ok(template, 'template is available on Ember.TEMPLATES');
@@ -59,24 +60,26 @@ test('template without data-template-name or id should default to application',
checkTemplate('application');
});
-test('template with type text/x-raw-handlebars should be parsed', function() {
- jQuery('#qunit-fixture').html('<script type="text/x-raw-handlebars" data-template-name="funkyTemplate">{{name}}</script>');
+if (typeof Handlebars === 'object') {
+ test('template with type text/x-raw-handlebars should be parsed', function() {
+ jQuery('#qunit-fixture').html('<script type="text/x-raw-handlebars" data-template-name="funkyTemplate">{{name}}</script>');
- run(function() {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
- });
+ run(function() {
+ bootstrap(jQuery('#qunit-fixture'));
+ });
- ok(Ember.TEMPLATES['funkyTemplate'], 'template with name funkyTemplate available');
+ ok(Ember.TEMPLATES['funkyTemplate'], 'template with name funkyTemplate available');
- // This won't even work with Ember templates
- equal(trim(Ember.TEMPLATES['funkyTemplate']({ name: 'Tobias' })), "Tobias");
-});
+ // This won't even work with Ember templates
+ equal(trim(Ember.TEMPLATES['funkyTemplate']({ name: 'Tobias' })), "Tobias");
+ });
+}
test('duplicated default application templates should throw exception', function() {
jQuery('#qunit-fixture').html('<script type="text/x-handlebars">first</script><script type="text/x-handlebars">second</script>');
throws(function () {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
+ bootstrap(jQuery('#qunit-fixture'));
},
/Template named "[^"]+" already exists\./,
"duplicate templates should not be allowed");
@@ -86,7 +89,7 @@ test('default application template and id application template present should th
jQuery('#qunit-fixture').html('<script type="text/x-handlebars">first</script><script type="text/x-handlebars" id="application">second</script>');
throws(function () {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
+ bootstrap(jQuery('#qunit-fixture'));
},
/Template named "[^"]+" already exists\./,
"duplicate templates should not be allowed");
@@ -96,7 +99,7 @@ test('default application template and data-template-name application template p
jQuery('#qunit-fixture').html('<script type="text/x-handlebars">first</script><script type="text/x-handlebars" data-template-name="application">second</script>');
throws(function () {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
+ bootstrap(jQuery('#qunit-fixture'));
},
/Template named "[^"]+" already exists\./,
"duplicate templates should not be allowed");
@@ -106,7 +109,7 @@ test('duplicated template id should throw exception', function() {
jQuery('#qunit-fixture').html('<script type="text/x-handlebars" id="funkyTemplate">first</script><script type="text/x-handlebars" id="funkyTemplate">second</script>');
throws(function () {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
+ bootstrap(jQuery('#qunit-fixture'));
},
/Template named "[^"]+" already exists\./,
"duplicate templates should not be allowed");
@@ -116,7 +119,7 @@ test('duplicated template data-template-name should throw exception', function()
jQuery('#qunit-fixture').html('<script type="text/x-handlebars" data-template-name="funkyTemplate">first</script><script type="text/x-handlebars" data-template-name="funkyTemplate">second</script>');
throws(function () {
- Ember.Handlebars.bootstrap(jQuery('#qunit-fixture'));
+ bootstrap(jQuery('#qunit-fixture'));
},
/Template named "[^"]+" already exists\./,
"duplicate templates should not be allowed"); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-routing-htmlbars/lib/helpers/link-to.js | @@ -7,6 +7,9 @@ import Ember from "ember-metal/core"; // assert
import { LinkView } from "ember-routing-views/views/link";
import { read, isStream } from "ember-metal/streams/utils";
import ControllerMixin from "ember-runtime/mixins/controller";
+import {
+ escapeExpression
+} from "ember-htmlbars/utils/string";
// We need the HTMLBars view helper from ensure ember-htmlbars.
// This ensures it is loaded first:
@@ -301,11 +304,9 @@ function linkToHelper(params, hash, options, env) {
options.template = {
isHTMLBars: true,
render: function() {
- // HTMLBars TODO: what do we use as a replacement to
- // `Handlebars.Utils.escapeExpression` ?
var value = read(linkTitle);
if (value) {
- return shouldEscape ? Handlebars.Utils.escapeExpression(value) : value;
+ return shouldEscape ? escapeExpression(value) : value;
} else {
return "";
} | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-routing-htmlbars/tests/helpers/action_test.js | @@ -10,49 +10,26 @@ import { default as EmberController } from "ember-runtime/controllers/controller
import EmberObjectController from "ember-runtime/controllers/object_controller";
import EmberArrayController from "ember-runtime/controllers/array_controller";
-import EmberHandlebars from "ember-handlebars";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import EmberView from "ember-views/views/view";
import EmberComponent from "ember-views/views/component";
import jQuery from "ember-views/system/jquery";
import {
- registerHelper as htmlbarsRegisterHelper,
- default as htmlbarsHelpers
+ registerHelper,
+ default as helpers
} from "ember-htmlbars/helpers";
import {
- ActionHelper as HandlebarsActionHelper,
- actionHelper as handlebarsActionHelper
-} from "ember-routing-handlebars/helpers/action";
-
-import {
- ActionHelper as HTMLBarsActionHelper,
- actionHelper as htmlbarsActionHelper
+ ActionHelper,
+ actionHelper
} from "ember-routing-htmlbars/helpers/action";
import {
runAppend,
runDestroy
} from "ember-runtime/tests/utils";
-var compile, helpers, registerHelper, ActionHelper, actionHelper;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- helpers = htmlbarsHelpers;
- compile = htmlbarsCompile;
- registerHelper = htmlbarsRegisterHelper;
- actionHelper = htmlbarsActionHelper;
- ActionHelper = HTMLBarsActionHelper;
-} else {
- helpers = EmberHandlebars.helpers;
- compile = EmberHandlebars.compile;
- registerHelper = function(name, fn) {
- return EmberHandlebars.registerHelper(name, fn);
- };
- actionHelper = handlebarsActionHelper;
- ActionHelper = HandlebarsActionHelper;
-}
-
var dispatcher, view, originalActionHelper;
var originalRegisterAction = ActionHelper.registerAction;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-routing-htmlbars/tests/helpers/link-to_test.js | @@ -1,19 +1,11 @@
import "ember-routing-htmlbars";
import run from "ember-metal/run_loop";
-import EmberHandlebars from "ember-handlebars";
import EmberView from "ember-views/views/view";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
import { set } from "ember-metal/property_set";
import Controller from "ember-runtime/controllers/controller";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- compile = htmlbarsCompile;
-} else {
- compile = EmberHandlebars.compile;
-}
-
var view;
QUnit.module("Handlebars {{link-to}} helper", { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-routing-htmlbars/tests/helpers/outlet_test.js | @@ -1,5 +1,4 @@
import Ember from 'ember-metal/core'; // TEMPLATES
-import EmberHandlebars from "ember-handlebars";
import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
import run from "ember-metal/run_loop";
@@ -22,29 +21,13 @@ import EmberView from "ember-routing/ext/view";
import EmberContainerView from "ember-views/views/container_view";
import jQuery from "ember-views/system/jquery";
-import { outletHelper as handlebarsOutletHelper } from "ember-routing-handlebars/helpers/outlet";
-import { outletHelper as htmlbarsOutletHelper } from "ember-routing-htmlbars/helpers/outlet";
+import { outletHelper } from "ember-routing-htmlbars/helpers/outlet";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-import { registerHelper as htmlbarsRegisterHelper } from "ember-htmlbars/helpers";
-import htmlbarsHelpers from "ember-htmlbars/helpers";
+import compile from "ember-htmlbars/system/compile";
+import { registerHelper } from "ember-htmlbars/helpers";
+import helpers from "ember-htmlbars/helpers";
import { runAppend, runDestroy } from "ember-runtime/tests/utils";
-var compile, helpers, registerHelper, outletHelper;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- outletHelper = htmlbarsOutletHelper;
- compile = htmlbarsCompile;
- helpers = htmlbarsHelpers;
- registerHelper = htmlbarsRegisterHelper;
-} else {
- outletHelper = handlebarsOutletHelper;
- compile = EmberHandlebars.compile;
- helpers = EmberHandlebars.helpers;
- registerHelper = function(name, fn) {
- EmberHandlebars.registerHelper(name, fn);
- };
-}
-
var buildContainer = function(namespace) {
var container = new Container();
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-routing-htmlbars/tests/helpers/render_test.js | @@ -19,43 +19,18 @@ import EmberArrayController from "ember-runtime/controllers/array_controller";
import EmberRouter from "ember-routing/system/router";
import HashLocation from "ember-routing/location/hash_location";
-import EmberHandlebars from "ember-handlebars";
-import { registerHelper as htmlbarsRegisterHelper } from "ember-htmlbars/helpers";
-import htmlbarsHelpers from "ember-htmlbars/helpers";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import { registerHelper } from "ember-htmlbars/helpers";
+import helpers from "ember-htmlbars/helpers";
+import compile from "ember-htmlbars/system/compile";
import EmberView from "ember-routing/ext/view";
import _MetamorphView from "ember-views/views/metamorph_view";
import jQuery from "ember-views/system/jquery";
import ActionManager from "ember-views/system/action_manager";
-import { renderHelper as handlebarsRenderHelper } from "ember-routing-handlebars/helpers/render";
-import { actionHelper as handlebarsActionHelper } from "ember-routing-handlebars/helpers/action";
-import { outletHelper as handlebarsOutletHelper } from "ember-routing-handlebars/helpers/outlet";
-
-import { renderHelper as htmlbarsRenderHelper } from "ember-routing-htmlbars/helpers/render";
-import { actionHelper as htmlbarsActionHelper } from "ember-routing-htmlbars/helpers/action";
-import { outletHelper as htmlbarsOutletHelper } from "ember-routing-htmlbars/helpers/outlet";
-
-var compile, helpers, registerHelper;
-var renderHelper, actionHelper, outletHelper;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- renderHelper = htmlbarsRenderHelper;
- actionHelper = htmlbarsActionHelper;
- outletHelper = htmlbarsOutletHelper;
- compile = htmlbarsCompile;
- helpers = htmlbarsHelpers;
- registerHelper = htmlbarsRegisterHelper;
-} else {
- renderHelper = handlebarsRenderHelper;
- actionHelper = handlebarsActionHelper;
- outletHelper = handlebarsOutletHelper;
- compile = EmberHandlebars.compile;
- helpers = EmberHandlebars.helpers;
- registerHelper = function(name, fn) {
- EmberHandlebars.registerHelper(name, fn);
- };
-}
+import { renderHelper } from "ember-routing-htmlbars/helpers/render";
+import { actionHelper } from "ember-routing-htmlbars/helpers/action";
+import { outletHelper } from "ember-routing-htmlbars/helpers/outlet";
function appendView(view) {
run(function() { view.appendTo('#qunit-fixture'); }); | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-testing/tests/acceptance_test.js | @@ -6,13 +6,11 @@ import EmberView from "ember-views/views/view";
import "ember-testing/initializers"; // ensure the initializer is setup
import EmberApplication from "ember-application/system/application";
import EmberRoute from "ember-routing/system/route";
-import EmberHandlebars from "ember-handlebars";
+import compile from "ember-htmlbars/system/compile";
//ES6TODO: we need {{link-to}} and {{outlet}} to exist here
import "ember-routing"; //ES6TODO: fixme?
-var compile = EmberHandlebars.compile;
-
var App, find, click, fillIn, currentRoute, visit, originalAdapter, andThen, indexHitCount;
QUnit.module("ember-testing Acceptance", { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-testing/tests/helpers_test.js | @@ -12,12 +12,10 @@ import setupForTesting from "ember-testing/setup_for_testing";
import EmberRouter from "ember-routing/system/router";
import EmberRoute from "ember-routing/system/route";
import EmberApplication from "ember-application/system/application";
-import EmberHandlebars from "ember-handlebars";
+import compile from "ember-htmlbars/system/compile";
var App, originalAdapter = Test.adapter;
-var compile = EmberHandlebars.compile;
-
function cleanup(){
// Teardown setupForTesting
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-testing/tests/integration_test.js | @@ -7,12 +7,10 @@ import EmberView from "ember-views/views/view";
import Test from "ember-testing/test";
import EmberRoute from "ember-routing/system/route";
import EmberApplication from "ember-application/system/application";
-import EmberHandlebars from "ember-handlebars";
+import compile from "ember-htmlbars/system/compile";
import 'ember-application';
-var compile = EmberHandlebars.compile;
-
var App, find, visit, originalAdapter = Test.adapter;
QUnit.module("ember-testing Integration", { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/lib/views/bound_view.js | @@ -3,15 +3,12 @@
@submodule ember-views
*/
-import Ember from "ember-metal/core"; // Ember.FEATURES
-import EmberHandlebars from "ember-handlebars-compiler"; // EmberHandlebars.SafeString;
import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
import merge from "ember-metal/merge";
-import handlebarsHtmlSafe from "ember-handlebars/string";
import {
- SafeString as htmlbarsSafeString,
- htmlSafe as htmlbarsHtmlSafe
+ escapeExpression,
+ SafeString
} from "ember-htmlbars/utils/string";
import {
cloneStates,
@@ -21,15 +18,6 @@ import _MetamorphView from "ember-views/views/metamorph_view";
function K() { return this; }
-var SafeString, htmlSafe;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- SafeString = htmlbarsSafeString;
- htmlSafe = htmlbarsHtmlSafe;
-} else {
- SafeString = EmberHandlebars.SafeString;
- htmlSafe = handlebarsHtmlSafe;
-}
-
var states = cloneStates(viewStates);
merge(states._default, {
@@ -186,7 +174,7 @@ var BoundView = _MetamorphView.extend({
result = String(result);
}
- if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+ if (escape) { result = escapeExpression(result); }
buffer.push(result);
return;
} | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/lib/views/select.js | @@ -1,10 +1,8 @@
/**
@module ember
-@submodule ember-handlebars
+@submodule ember-views
*/
-import EmberHandlebars from "ember-handlebars-compiler";
-
import {
forEach,
indexOf,
@@ -24,36 +22,22 @@ import { observer } from "ember-metal/mixin";
import { defineProperty } from "ember-metal/properties";
import run from "ember-metal/run_loop";
-import handlebarsTemplate from "ember-handlebars/templates/select";
import htmlbarsTemplate from "ember-htmlbars/templates/select";
-var defaultTemplate;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- defaultTemplate = htmlbarsTemplate;
-} else {
- defaultTemplate = handlebarsTemplate;
-}
-
-var selectOptionDefaultTemplate;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- selectOptionDefaultTemplate = {
- isHTMLBars: true,
- render: function(context, env, contextualElement) {
- var lazyValue = context.getStream('view.label');
-
- lazyValue.subscribe(context._wrapAsScheduled(function() {
- run.scheduleOnce('render', context, 'rerender');
- }));
-
- return lazyValue.value();
- }
- };
-} else {
- selectOptionDefaultTemplate = function(context, env) {
- var options = { data: env.data, hash: {} };
- EmberHandlebars.helpers.bind.call(context, "view.label", options);
- };
-}
+var defaultTemplate = htmlbarsTemplate;
+
+var selectOptionDefaultTemplate = {
+ isHTMLBars: true,
+ render: function(context, env, contextualElement) {
+ var lazyValue = context.getStream('view.label');
+
+ lazyValue.subscribe(context._wrapAsScheduled(function() {
+ run.scheduleOnce('render', context, 'rerender');
+ }));
+
+ return lazyValue.value();
+ }
+};
var SelectOption = View.extend({
instrumentDisplay: 'Ember.SelectOption', | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/lib/views/simple_bound_view.js | @@ -3,11 +3,8 @@
@submodule ember-views
*/
-import Ember from "ember-metal/core"; // Ember.FEATURES
-import EmberHandlebars from "ember-handlebars-compiler"; // EmberHandlebars.SafeString;
import EmberError from "ember-metal/error";
import run from "ember-metal/run_loop";
-import handlebarsHtmlSafe from "ember-handlebars/string";
import {
SafeString as htmlbarsSafeString,
htmlSafe as htmlbarsHtmlSafe
@@ -19,14 +16,8 @@ import {
function K() { return this; }
-var SafeString, htmlSafe;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
- SafeString = htmlbarsSafeString;
- htmlSafe = htmlbarsHtmlSafe;
-} else {
- SafeString = EmberHandlebars.SafeString;
- htmlSafe = handlebarsHtmlSafe;
-}
+var SafeString = htmlbarsSafeString;
+var htmlSafe = htmlbarsHtmlSafe;
function SimpleBoundView(lazyValue, isEscaped) {
this.lazyValue = lazyValue; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/tests/views/metamorph_view_test.js | @@ -4,10 +4,8 @@ import EmberView from "ember-views/views/view";
import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
import { observer } from "ember-metal/mixin";
-import EmberHandlebars from "ember-handlebars-compiler";
-
+import compile from "ember-htmlbars/system/compile";
import _MetamorphView from "ember-views/views/metamorph_view";
-var compile = EmberHandlebars.compile;
var view, childView, metamorphView;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/tests/views/view/nested_view_ordering_test.js | @@ -2,9 +2,7 @@ import Container from "container";
import run from "ember-metal/run_loop";
import EmberView from "ember-views/views/view";
-import EmberHandlebars from "ember-handlebars-compiler";
-
-var compile = EmberHandlebars.compile;
+import compile from "ember-htmlbars/system/compile";
var container, view;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/tests/views/view/render_test.js | @@ -4,9 +4,7 @@ import jQuery from "ember-views/system/jquery";
import EmberView from "ember-views/views/view";
import ContainerView from "ember-views/views/container_view";
-import EmberHandlebars from "ember-handlebars-compiler";
-
-var compile = EmberHandlebars.compile;
+import compile from "ember-htmlbars/system/compile";
var view;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember-views/tests/views/view/template_test.js | @@ -29,18 +29,20 @@ test("Template views return throw if their template cannot be found", function()
}, /cantBeFound/);
});
-test("should allow standard Handlebars template usage", function() {
- view = EmberView.create({
- context: { name: "Erik" },
- template: Handlebars.compile("Hello, {{name}}")
- });
+if (typeof Handlebars === "object") {
+ test("should allow standard Handlebars template usage", function() {
+ view = EmberView.create({
+ context: { name: "Erik" },
+ template: Handlebars.compile("Hello, {{name}}")
+ });
- run(function() {
- view.createElement();
- });
+ run(function() {
+ view.createElement();
+ });
- equal(view.$().text(), "Hello, Erik");
-});
+ equal(view.$().text(), "Hello, Erik");
+ });
+}
test("should call the function of the associated template", function() {
container.register('template:testTemplate', function() { | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/lib/main.js | @@ -3,10 +3,8 @@
// this is so that the global exports occur properly
import "ember-metal";
import "ember-runtime";
-import "ember-handlebars";
import "ember-views";
import "ember-routing";
-import "ember-routing-handlebars";
import "ember-application";
import "ember-extension-support";
import "ember-htmlbars"; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/component_registration_test.js | @@ -1,10 +1,7 @@
import "ember";
-import EmberHandlebars from "ember-handlebars";
-
-var compile, helpers;
-compile = EmberHandlebars.compile;
-helpers = EmberHandlebars.helpers;
+import compile from "ember-htmlbars/system/compile";
+import helpers from "ember-htmlbars/helpers";
var App, container;
var originalHelpers; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/helpers/helper_registration_test.js | @@ -1,6 +1,6 @@
import "ember";
-import EmberHandlebars from "ember-handlebars";
+import EmberHandlebars from "ember-htmlbars/compat";
var compile, helpers, makeBoundHelper;
compile = EmberHandlebars.compile; | true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/helpers/link_to_test.js | @@ -1,6 +1,6 @@
import "ember";
-import EmberHandlebars from "ember-handlebars";
+import EmberHandlebars from "ember-htmlbars/compat";
var compile = EmberHandlebars.compile;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/homepage_example_test.js | @@ -1,6 +1,6 @@
import "ember";
-import EmberHandlebars from "ember-handlebars";
+import EmberHandlebars from "ember-htmlbars/compat";
var compile = EmberHandlebars.compile;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/routing/basic_test.js | @@ -4,7 +4,7 @@ import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
import ActionManager from "ember-views/system/action_manager";
-import EmberHandlebars from "ember-handlebars";
+import EmberHandlebars from "ember-htmlbars/compat";
var compile = EmberHandlebars.compile;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/routing/query_params_test.js | @@ -3,7 +3,7 @@ import { computed } from "ember-metal/computed";
import { canDefineNonEnumerableProperties } from 'ember-metal/platform';
import { capitalize } from "ember-runtime/system/string";
-import EmberHandlebars from "ember-handlebars";
+import EmberHandlebars from "ember-htmlbars/compat";
var compile = EmberHandlebars.compile;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | packages/ember/tests/routing/substates_test.js | @@ -1,6 +1,6 @@
import "ember";
-import EmberHandlebars from "ember-handlebars";
+import EmberHandlebars from "ember-htmlbars/compat";
var compile = EmberHandlebars.compile;
| true |
Other | emberjs | ember.js | 0fd774a1c755bf2049e5f9ea48990d845b6ce40f.json | Remove Handlebars packages from build pipeline. | tests/index.html | @@ -5,7 +5,6 @@
<title>Ember</title>
<link rel="stylesheet" href="../qunit/qunit.css">
<script src="../qunit/qunit.js"></script>
- <script src="../handlebars/handlebars.js"></script>
<script type="text/javascript">
window.loadScript = function(url) { | true |
Other | emberjs | ember.js | af8a39c6220d678e037b74acbc574586fb7f30be.json | Use AST builders in each/with transforms | packages/ember-htmlbars/lib/plugins/transform-each-in-to-hash.js | @@ -1,4 +1,5 @@
import Walker from "htmlbars-syntax/walker";
+import b from "htmlbars-syntax/builders";
/**
An HTMLBars AST transformation that replaces all instances of
@@ -25,26 +26,16 @@ export default function(ast) {
if (validate(node)) {
var removedParams = node.sexpr.params.splice(0, 2);
var keyword = removedParams[0].original;
- var stringNode = {
- type: 'StringLiteral',
- value: keyword,
- original: keyword
- };
+ // TODO: This may not be necessary.
if (!node.sexpr.hash) {
- node.sexpr.hash = {
- type: 'Hash',
- pairs: []
- };
+ node.sexpr.hash = b.hash();
}
- var hashPair = {
- type: 'HashPair',
- key: 'keyword',
- value: stringNode
- };
-
- node.sexpr.hash.pairs.push(hashPair);
+ node.sexpr.hash.pairs.push(b.pair(
+ 'keyword',
+ b.string(keyword)
+ ));
}
});
| true |
Other | emberjs | ember.js | af8a39c6220d678e037b74acbc574586fb7f30be.json | Use AST builders in each/with transforms | packages/ember-htmlbars/lib/plugins/transform-with-as-to-hash.js | @@ -1,4 +1,5 @@
import Walker from "htmlbars-syntax/walker";
+import b from "htmlbars-syntax/builders";
/**
An HTMLBars AST transformation that replaces all instances of
@@ -25,26 +26,16 @@ export default function(ast) {
if (validate(node)) {
var removedParams = node.sexpr.params.splice(1, 2);
var keyword = removedParams[1].original;
- var stringNode = {
- type: 'StringLiteral',
- value: keyword,
- original: keyword
- };
+ // TODO: This may not be necessary.
if (!node.sexpr.hash) {
- node.sexpr.hash = {
- type: 'Hash',
- pairs: []
- };
+ node.sexpr.hash = b.hash();
}
- var hashPair = {
- type: 'HashPair',
- key: 'keywordName',
- value: stringNode
- };
-
- node.sexpr.hash.pairs.push(hashPair);
+ node.sexpr.hash.pairs.push(b.pair(
+ 'keywordName',
+ b.string(keyword)
+ ));
}
});
| true |
Other | emberjs | ember.js | cb7d7cd80b05a6db36974f55894e4e7015148de6.json | Move concat into hooks module | packages/ember-htmlbars/lib/attr_nodes/concat.js | @@ -4,7 +4,6 @@
*/
import SimpleAttrNode from "./simple";
-import concat from "ember-htmlbars/system/concat";
import { create as o_create } from "ember-metal/platform";
function ConcatAttrNode(element, attrName, attrValue, dom) { | true |
Other | emberjs | ember.js | cb7d7cd80b05a6db36974f55894e4e7015148de6.json | Move concat into hooks module | packages/ember-htmlbars/lib/hooks/concat.js | @@ -6,6 +6,8 @@
import Stream from "ember-metal/streams/stream";
import {readArray} from "ember-metal/streams/utils";
+// TODO: Create subclass ConcatStream < Stream. Defer
+// subscribing to streams until the value() is called.
export default function concat(params) {
var stream = new Stream(function() {
return readArray(params).join(''); | true |
Other | emberjs | ember.js | cb7d7cd80b05a6db36974f55894e4e7015148de6.json | Move concat into hooks module | packages/ember-htmlbars/lib/main.js | @@ -4,6 +4,7 @@ import component from "ember-htmlbars/hooks/component";
import element from "ember-htmlbars/hooks/element";
import subexpr from "ember-htmlbars/hooks/subexpr";
import attribute from "ember-htmlbars/hooks/attribute";
+import concat from "ember-htmlbars/hooks/concat";
import get from "ember-htmlbars/hooks/get";
import set from "ember-htmlbars/hooks/set";
import { DOMHelper } from "morph";
@@ -17,7 +18,6 @@ import {
helper,
default as helpers
} from "ember-htmlbars/helpers";
-import concat from "ember-htmlbars/system/concat";
import { bindHelper } from "ember-htmlbars/helpers/binding";
import { viewHelper } from "ember-htmlbars/helpers/view";
import { yieldHelper } from "ember-htmlbars/helpers/yield"; | true |
Other | emberjs | ember.js | 9e45c360163b19e9e41e51e8245bd1aa33f7485b.json | Ignore TextNode's in quoted class AST transform.
`TextNode`'s only occur when the attribute has a single non-dynamic
value. | packages/ember-htmlbars/lib/plugins/transform-quoted-class.js | @@ -53,6 +53,10 @@ export default function(ast) {
var eachValue, currentValue, parts, containsNonStringLiterals;
var i, l;
while (eachValue = values[eachIndex]) {
+ if (eachValue.type === 'TextNode') {
+ return; // TextNode means no dynamic parts
+ }
+
if (eachValue.type === 'StringLiteral') {
parts = eachValue.value.split(' ');
for (i=0,l=parts.length;i<l;i++) { | false |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/accessors/get_test.js | @@ -1,4 +1,4 @@
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import {
get,
getWithDefault | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/binding/connect_test.js | @@ -1,5 +1,5 @@
import Ember from 'ember-metal/core';
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import {
Binding,
bind | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/binding/sync_test.js | @@ -1,4 +1,4 @@
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import run from 'ember-metal/run_loop';
import {
addObserver | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/computed_test.js | @@ -1,5 +1,5 @@
import Ember from 'ember-metal/core';
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import { create } from 'ember-metal/platform';
import {
ComputedProperty, | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/mixin/observer_test.js | @@ -1,6 +1,4 @@
-/*globals testBoth */
-
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import {
observer,
mixin, | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/observer_test.js | @@ -1,5 +1,5 @@
import Ember from 'ember-metal/core';
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import {
addObserver,
removeObserver, | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/props_helper.js | @@ -1,14 +1,53 @@
-import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
+import Ember from 'ember-metal/core';
+import {get as getFromEmberMetal, getWithDefault as getWithDefaultFromEmberMetal} from 'ember-metal/property_get';
+import {set as setFromEmberMetal} from 'ember-metal/property_set';
// used by unit tests to test both accessor mode and non-accessor mode
-export default function(testname, callback) {
- test(testname+' using Ember.get()/Ember.set()', function() {
- callback(get, set);
+var testBoth = function(testname, callback) {
+
+ function emberget(x,y) { return getFromEmberMetal(x,y); }
+ function emberset(x,y,z) { return setFromEmberMetal(x,y,z); }
+ function aget(x,y) { return x[y]; }
+ function aset(x,y,z) { return (x[y] = z); }
+
+ test(testname+' using getFromEmberMetal()/Ember.set()', function() {
+ callback(emberget, emberset);
+ });
+
+ test(testname+' using accessors', function() {
+ if (Ember.USES_ACCESSORS) callback(aget, aset);
+ else ok('SKIPPING ACCESSORS');
+ });
+};
+
+var testWithDefault = function(testname, callback) {
+ function emberget(x,y) { return getFromEmberMetal(x,y); }
+ function embergetwithdefault(x,y,z) { return getWithDefaultFromEmberMetal(x,y,z); }
+ function getwithdefault(x,y,z) { return x.getWithDefault(y,z); }
+ function emberset(x,y,z) { return setFromEmberMetal(x,y,z); }
+ function aget(x,y) { return x[y]; }
+ function aset(x,y,z) { return (x[y] = z); }
+
+ test(testname+' using obj.get()', function() {
+ callback(emberget, emberset);
+ });
+
+ test(testname+' using obj.getWithDefault()', function() {
+ callback(getwithdefault, emberset);
+ });
+
+ test(testname+' using getFromEmberMetal()', function() {
+ callback(emberget, emberset);
+ });
+
+ test(testname+' using Ember.getWithDefault()', function() {
+ callback(embergetwithdefault, emberset);
+ });
+
+ test(testname+' using accessors', function() {
+ if (Ember.USES_ACCESSORS) callback(aget, aset);
+ else ok('SKIPPING ACCESSORS');
});
+};
- // test(testname+' using accessors', function() {
- // if (Ember.USES_ACCESSORS) callback(aget, aset);
- // else ok('SKIPPING ACCESSORS');
- // });
-}
+export {testWithDefault, testBoth}; | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/watching/unwatch_test.js | @@ -1,4 +1,4 @@
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import {
watch,
unwatch | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-metal/tests/watching/watch_test.js | @@ -1,5 +1,5 @@
import Ember from 'ember-metal/core';
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import { indexOf } from 'ember-metal/enumerable_utils';
import { addListener } from "ember-metal/events";
import {
@@ -39,7 +39,6 @@ function addListeners(obj, keyPath) {
}
testBoth('watching a computed property', function(get, set) {
-
var obj = {};
Ember.defineProperty(obj, 'foo', Ember.computed(function(keyName, value) {
if (value !== undefined) this.__foo = value;
@@ -54,7 +53,6 @@ testBoth('watching a computed property', function(get, set) {
});
testBoth('watching a regular defined property', function(get, set) {
-
var obj = { foo: 'baz' };
addListeners(obj, 'foo');
@@ -70,7 +68,6 @@ testBoth('watching a regular defined property', function(get, set) {
});
testBoth('watching a regular undefined property', function(get, set) {
-
var obj = { };
addListeners(obj, 'foo');
@@ -88,7 +85,6 @@ testBoth('watching a regular undefined property', function(get, set) {
});
testBoth('watches should inherit', function(get, set) {
-
var obj = { foo: 'baz' };
var objB = Ember.create(obj);
@@ -103,7 +99,6 @@ testBoth('watches should inherit', function(get, set) {
});
test("watching an object THEN defining it should work also", function() {
-
var obj = {};
addListeners(obj, 'foo');
@@ -154,7 +149,6 @@ test("watching a chain then defining the nested property", function () {
});
testBoth('watching an object value then unwatching should restore old value', function(get, set) {
-
var obj = { foo: { bar: { baz: { biff: 'BIFF' } } } };
addListeners(obj, 'foo.bar.baz.biff');
@@ -197,7 +191,6 @@ testBoth('watching a global object that does not yet exist should queue', functi
});
test('when watching a global object, destroy should remove chain watchers from the global object', function() {
-
lookup['Global'] = Global = { foo: 'bar' };
var obj = {};
addListeners(obj, 'Global.foo');
@@ -221,7 +214,6 @@ test('when watching a global object, destroy should remove chain watchers from t
});
test('when watching another object, destroy should remove chain watchers from the other object', function() {
-
var objA = {};
var objB = {foo: 'bar'};
objA.b = objB;
@@ -246,7 +238,6 @@ test('when watching another object, destroy should remove chain watchers from th
// TESTS for length property
testBoth('watching "length" property on an object', function(get, set) {
-
var obj = { length: '26.2 miles' };
addListeners(obj, 'length');
@@ -262,7 +253,6 @@ testBoth('watching "length" property on an object', function(get, set) {
});
testBoth('watching "length" property on an array', function(get, set) {
-
var arr = [];
addListeners(arr, 'length');
| true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-runtime/tests/computed/compose_computed_test.js | @@ -1,11 +1,11 @@
import Ember from 'ember-metal/core';
-import {addObserver} from 'ember-metal/observer';
-import {computed} from 'ember-metal/computed';
-import {mapBy, union, sort} from 'ember-runtime/computed/reduce_computed_macros';
+import { addObserver } from 'ember-metal/observer';
+import { computed } from 'ember-metal/computed';
+import { mapBy, union, sort } from 'ember-runtime/computed/reduce_computed_macros';
import run from 'ember-metal/run_loop';
-import {defineProperty} from "ember-metal/properties";
+import { defineProperty } from "ember-metal/properties";
import compare from 'ember-runtime/compare';
-import testBoth from 'ember-metal/tests/props_helper';
+import { testBoth } from 'ember-metal/tests/props_helper';
import EmberObject from 'ember-runtime/system/object';
if (Ember.FEATURES.isEnabled('composable-computed-properties')) { | true |
Other | emberjs | ember.js | 80be0ac7c8ab46f6ed09d27ca87bf6877c20229b.json | Remove duplicate `props_helper` module
Utilize the more full-fledged `ember-runtime/tests/props_helper` module
instead. | packages/ember-runtime/tests/computed/computed_macros_test.js | @@ -1,6 +1,6 @@
-import {computed} from "ember-metal/computed";
+import { computed } from "ember-metal/computed";
import EmberObject from "ember-runtime/system/object";
-import {testBoth} from "ember-runtime/tests/props_helper";
+import { testBoth } from "ember-metal/tests/props_helper";
QUnit.module('CP macros');
@@ -44,4 +44,4 @@ testBoth('Ember.computed.notEmpty', function(get, set) {
equal(get(obj, 'bestLannisterSpecified'), true, "empty respects strings");
equal(get(obj, 'LannistersKnown'), true, "empty respects array mutations");
-});
\ No newline at end of file
+}); | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.