From 0fd774a1c755bf2049e5f9ea48990d845b6ce40f Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sat, 6 Dec 2014 22:18:30 -0500 Subject: [PATCH] Remove Handlebars packages from build pipeline. --- Brocfile.js | 42 ++--------------- ...ccoli-ember-inline-template-precompiler.js | 6 +-- lib/packages.js | 5 +- package.json | 5 +- .../lib/system/application.js | 2 - .../ember-application/lib/system/resolver.js | 4 +- .../tests/system/application_test.js | 12 ++--- .../default_resolver_test.js | 10 ++-- packages/ember-htmlbars/lib/compat.js | 4 +- .../ember-htmlbars/lib/helpers/collection.js | 4 +- packages/ember-htmlbars/lib/utils/string.js | 11 ++++- .../tests/compat/make-view-helper_test.js | 17 ++----- .../tests/compat/precompile_test.js | 3 +- packages/ember-htmlbars/tests/helper_test.js | 18 ++------ .../tests/helpers/bind_attr_test.js | 16 +------ .../ember-htmlbars/tests/helpers/bind_test.js | 10 +--- .../tests/helpers/collection_test.js | 9 +--- .../tests/helpers/debug_test.js | 10 +--- .../ember-htmlbars/tests/helpers/each_test.js | 30 +++++------- .../tests/helpers/if_unless_test.js | 10 +--- .../tests/helpers/input_test.js | 11 +---- .../ember-htmlbars/tests/helpers/loc_test.js | 10 +--- .../ember-htmlbars/tests/helpers/log_test.js | 9 +--- .../tests/helpers/partial_test.js | 10 +--- .../tests/helpers/template_test.js | 10 +--- .../tests/helpers/text_area_test.js | 10 +--- .../tests/helpers/unbound_test.js | 29 ++---------- .../ember-htmlbars/tests/helpers/view_test.js | 26 +++-------- .../ember-htmlbars/tests/helpers/with_test.js | 11 +---- .../tests/helpers/yield_test.js | 14 +----- .../integration/binding_integration_test.js | 30 ++++-------- .../integration/component_invocation_test.js | 10 +--- .../integration/escape_integration_test.js | 10 +--- .../integration/globals_integration_test.js | 9 +--- .../integration/select_in_template_test.js | 10 +--- .../tests/integration/with_view_test.js | 14 +----- .../tests/system/bootstrap_test.js | 33 +++++++------ .../lib/helpers/link-to.js | 7 +-- .../tests/helpers/action_test.js | 33 ++----------- .../tests/helpers/link-to_test.js | 10 +--- .../tests/helpers/outlet_test.js | 25 ++-------- .../tests/helpers/render_test.js | 37 +++------------ .../ember-testing/tests/acceptance_test.js | 4 +- packages/ember-testing/tests/helpers_test.js | 4 +- .../ember-testing/tests/integration_test.js | 4 +- packages/ember-views/lib/views/bound_view.js | 18 ++------ packages/ember-views/lib/views/select.js | 46 ++++++------------- .../lib/views/simple_bound_view.js | 13 +----- .../tests/views/metamorph_view_test.js | 4 +- .../views/view/nested_view_ordering_test.js | 4 +- .../tests/views/view/render_test.js | 4 +- .../tests/views/view/template_test.js | 22 +++++---- packages/ember/lib/main.js | 2 - .../tests/component_registration_test.js | 7 +-- .../tests/helpers/helper_registration_test.js | 2 +- packages/ember/tests/helpers/link_to_test.js | 2 +- packages/ember/tests/homepage_example_test.js | 2 +- packages/ember/tests/routing/basic_test.js | 2 +- .../ember/tests/routing/query_params_test.js | 2 +- .../ember/tests/routing/substates_test.js | 2 +- tests/index.html | 1 - 61 files changed, 177 insertions(+), 564 deletions(-) diff --git a/Brocfile.js b/Brocfile.js index 565a2c32ef3..a13537c7c3e 100644 --- a/Brocfile.js +++ b/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 diff --git a/lib/broccoli-ember-inline-template-precompiler.js b/lib/broccoli-ember-inline-template-precompiler.js index 48b2f0ccc52..38076af2ac3 100644 --- a/lib/broccoli-ember-inline-template-precompiler.js +++ b/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/)) { diff --git a/lib/packages.js b/lib/packages.js index 61a7ae73b04..c62ec9f1005 100644 --- a/lib/packages.js +++ b/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']}, diff --git a/package.json b/package.json index 1c9885eb88c..e1aa2266d90 100644 --- a/package.json +++ b/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" } } diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js index 80f3c593cec..9d902869b2e 100644 --- a/packages/ember-application/lib/system/application.js +++ b/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); } diff --git a/packages/ember-application/lib/system/resolver.js b/packages/ember-application/lib/system/resolver.js index 602165fd814..549d0d68cab 100644 --- a/packages/ember-application/lib/system/resolver.js +++ b/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 diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js index 83574e18ee4..38eb5ab2917 100644 --- a/packages/ember-application/tests/system/application_test.js +++ b/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; diff --git a/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js b/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js index fa388ee0173..7b7b74b060b 100644 --- a/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js +++ b/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; diff --git a/packages/ember-htmlbars/lib/compat.js b/packages/ember-htmlbars/lib/compat.js index e87920db863..b030fbfcfc7 100644 --- a/packages/ember-htmlbars/lib/compat.js +++ b/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; diff --git a/packages/ember-htmlbars/lib/helpers/collection.js b/packages/ember-htmlbars/lib/helpers/collection.js index b6ba3eadfbd..0c16a9d37cc 100644 --- a/packages/ember-htmlbars/lib/helpers/collection.js +++ b/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, diff --git a/packages/ember-htmlbars/lib/utils/string.js b/packages/ember-htmlbars/lib/utils/string.js index 832bc877b45..e59acaf3ff7 100644 --- a/packages/ember-htmlbars/lib/utils/string.js +++ b/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 +}; diff --git a/packages/ember-htmlbars/tests/compat/make-view-helper_test.js b/packages/ember-htmlbars/tests/compat/make-view-helper_test.js index 19cb8785584..f64563a2d4f 100644 --- a/packages/ember-htmlbars/tests/compat/make-view-helper_test.js +++ b/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({ diff --git a/packages/ember-htmlbars/tests/compat/precompile_test.js b/packages/ember-htmlbars/tests/compat/precompile_test.js index fe713b67aa3..bc7934989df 100644 --- a/packages/ember-htmlbars/tests/compat/precompile_test.js +++ b/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'; diff --git a/packages/ember-htmlbars/tests/helper_test.js b/packages/ember-htmlbars/tests/helper_test.js index 4c7d12e3705..1c5dfcaa367 100644 --- a/packages/ember-htmlbars/tests/helper_test.js +++ b/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; diff --git a/packages/ember-htmlbars/tests/helpers/bind_attr_test.js b/packages/ember-htmlbars/tests/helpers/bind_attr_test.js index acd99ecb2e9..6e0c7ac8d45 100644 --- a/packages/ember-htmlbars/tests/helpers/bind_attr_test.js +++ b/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; diff --git a/packages/ember-htmlbars/tests/helpers/bind_test.js b/packages/ember-htmlbars/tests/helpers/bind_test.js index 4694b859b3e..2cf3eca7b84 100644 --- a/packages/ember-htmlbars/tests/helpers/bind_test.js +++ b/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(); diff --git a/packages/ember-htmlbars/tests/helpers/collection_test.js b/packages/ember-htmlbars/tests/helpers/collection_test.js index 0c29a39dcfa..64330d7ee18 100644 --- a/packages/ember-htmlbars/tests/helpers/collection_test.js +++ b/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; diff --git a/packages/ember-htmlbars/tests/helpers/debug_test.js b/packages/ember-htmlbars/tests/helpers/debug_test.js index ab2c062d838..e7132f8cae1 100644 --- a/packages/ember-htmlbars/tests/helpers/debug_test.js +++ b/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; diff --git a/packages/ember-htmlbars/tests/helpers/each_test.js b/packages/ember-htmlbars/tests/helpers/each_test.js index f92d2a20971..f76bc1a09fa 100644 --- a/packages/ember-htmlbars/tests/helpers/each_test.js +++ b/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); diff --git a/packages/ember-htmlbars/tests/helpers/if_unless_test.js b/packages/ember-htmlbars/tests/helpers/if_unless_test.js index 7d2fa9e77ce..08d50520f7e 100644 --- a/packages/ember-htmlbars/tests/helpers/if_unless_test.js +++ b/packages/ember-htmlbars/tests/helpers/if_unless_test.js @@ -5,8 +5,7 @@ import EmberView from "ember-views/views/view"; import ObjectProxy from "ember-runtime/system/object_proxy"; import EmberObject from "ember-runtime/system/object"; import _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'; @@ -14,13 +13,6 @@ 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; diff --git a/packages/ember-htmlbars/tests/helpers/input_test.js b/packages/ember-htmlbars/tests/helpers/input_test.js index 53cf632909a..eabbb3bbd42 100644 --- a/packages/ember-htmlbars/tests/helpers/input_test.js +++ b/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; diff --git a/packages/ember-htmlbars/tests/helpers/loc_test.js b/packages/ember-htmlbars/tests/helpers/loc_test.js index 71b3ea9b2f7..2dca2a4fc8f 100644 --- a/packages/ember-htmlbars/tests/helpers/loc_test.js +++ b/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), diff --git a/packages/ember-htmlbars/tests/helpers/log_test.js b/packages/ember-htmlbars/tests/helpers/log_test.js index fcf00dbe9aa..5b500539b27 100644 --- a/packages/ember-htmlbars/tests/helpers/log_test.js +++ b/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 }; diff --git a/packages/ember-htmlbars/tests/helpers/partial_test.js b/packages/ember-htmlbars/tests/helpers/partial_test.js index fca62b12f13..12dcae58891 100644 --- a/packages/ember-htmlbars/tests/helpers/partial_test.js +++ b/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 }; diff --git a/packages/ember-htmlbars/tests/helpers/template_test.js b/packages/ember-htmlbars/tests/helpers/template_test.js index 83b18f260c9..4bc91304dc3 100644 --- a/packages/ember-htmlbars/tests/helpers/template_test.js +++ b/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 }; diff --git a/packages/ember-htmlbars/tests/helpers/text_area_test.js b/packages/ember-htmlbars/tests/helpers/text_area_test.js index 49db538060e..f76cb2f1a8c 100644 --- a/packages/ember-htmlbars/tests/helpers/text_area_test.js +++ b/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) { diff --git a/packages/ember-htmlbars/tests/helpers/unbound_test.js b/packages/ember-htmlbars/tests/helpers/unbound_test.js index 80fac8c2d3c..c08aeb06bc9 100644 --- a/packages/ember-htmlbars/tests/helpers/unbound_test.js +++ b/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 diff --git a/packages/ember-htmlbars/tests/helpers/view_test.js b/packages/ember-htmlbars/tests/helpers/view_test.js index a77688b7928..ae2a54337ea 100644 --- a/packages/ember-htmlbars/tests/helpers/view_test.js +++ b/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'; }) diff --git a/packages/ember-htmlbars/tests/helpers/with_test.js b/packages/ember-htmlbars/tests/helpers/with_test.js index 72b888d98c6..2f482b2717e 100644 --- a/packages/ember-htmlbars/tests/helpers/with_test.js +++ b/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; diff --git a/packages/ember-htmlbars/tests/helpers/yield_test.js b/packages/ember-htmlbars/tests/helpers/yield_test.js index 6249cc8793d..093e4118c1d 100644 --- a/packages/ember-htmlbars/tests/helpers/yield_test.js +++ b/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", { diff --git a/packages/ember-htmlbars/tests/integration/binding_integration_test.js b/packages/ember-htmlbars/tests/integration/binding_integration_test.js index 6ed8bd58b7a..899ce2cd515 100644 --- a/packages/ember-htmlbars/tests/integration/binding_integration_test.js +++ b/packages/ember-htmlbars/tests/integration/binding_integration_test.js @@ -5,11 +5,10 @@ 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'; @@ -17,12 +16,6 @@ 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; }); diff --git a/packages/ember-htmlbars/tests/integration/component_invocation_test.js b/packages/ember-htmlbars/tests/integration/component_invocation_test.js index 045218945a4..f0c7dfe1a44 100644 --- a/packages/ember-htmlbars/tests/integration/component_invocation_test.js +++ b/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', { diff --git a/packages/ember-htmlbars/tests/integration/escape_integration_test.js b/packages/ember-htmlbars/tests/integration/escape_integration_test.js index 819ec871f7f..2a87a697192 100644 --- a/packages/ember-htmlbars/tests/integration/escape_integration_test.js +++ b/packages/ember-htmlbars/tests/integration/escape_integration_test.js @@ -1,8 +1,6 @@ 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'; @@ -10,12 +8,6 @@ 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); diff --git a/packages/ember-htmlbars/tests/integration/globals_integration_test.js b/packages/ember-htmlbars/tests/integration/globals_integration_test.js index cc1c24ac6ef..4bfeaf846c8 100644 --- a/packages/ember-htmlbars/tests/integration/globals_integration_test.js +++ b/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', { diff --git a/packages/ember-htmlbars/tests/integration/select_in_template_test.js b/packages/ember-htmlbars/tests/integration/select_in_template_test.js index ae9b9bbf923..74a67a1f7ce 100644 --- a/packages/ember-htmlbars/tests/integration/select_in_template_test.js +++ b/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(); diff --git a/packages/ember-htmlbars/tests/integration/with_view_test.js b/packages/ember-htmlbars/tests/integration/with_view_test.js index f8990449db1..71e9010c3bd 100644 --- a/packages/ember-htmlbars/tests/integration/with_view_test.js +++ b/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() { diff --git a/packages/ember-htmlbars/tests/system/bootstrap_test.js b/packages/ember-htmlbars/tests/system/bootstrap_test.js index 8f7032afdee..e1f26f78fbb 100644 --- a/packages/ember-htmlbars/tests/system/bootstrap_test.js +++ b/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(''); +if (typeof Handlebars === 'object') { + test('template with type text/x-raw-handlebars should be parsed', function() { + jQuery('#qunit-fixture').html(''); - 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(''); 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(''); 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(''); 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(''); 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(''); throws(function () { - Ember.Handlebars.bootstrap(jQuery('#qunit-fixture')); + bootstrap(jQuery('#qunit-fixture')); }, /Template named "[^"]+" already exists\./, "duplicate templates should not be allowed"); diff --git a/packages/ember-routing-htmlbars/lib/helpers/link-to.js b/packages/ember-routing-htmlbars/lib/helpers/link-to.js index d39f61045f6..79fe9e6c14b 100644 --- a/packages/ember-routing-htmlbars/lib/helpers/link-to.js +++ b/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 ""; } diff --git a/packages/ember-routing-htmlbars/tests/helpers/action_test.js b/packages/ember-routing-htmlbars/tests/helpers/action_test.js index ee09c42b6b4..023cd1ba71c 100644 --- a/packages/ember-routing-htmlbars/tests/helpers/action_test.js +++ b/packages/ember-routing-htmlbars/tests/helpers/action_test.js @@ -10,25 +10,19 @@ 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 { @@ -36,23 +30,6 @@ import { 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; diff --git a/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js b/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js index b89b2929e70..281e69fae4a 100644 --- a/packages/ember-routing-htmlbars/tests/helpers/link-to_test.js +++ b/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", { diff --git a/packages/ember-routing-htmlbars/tests/helpers/outlet_test.js b/packages/ember-routing-htmlbars/tests/helpers/outlet_test.js index 08f19cf1735..d0b66624a45 100644 --- a/packages/ember-routing-htmlbars/tests/helpers/outlet_test.js +++ b/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(); diff --git a/packages/ember-routing-htmlbars/tests/helpers/render_test.js b/packages/ember-routing-htmlbars/tests/helpers/render_test.js index afe09c72ead..f1827ec2aba 100644 --- a/packages/ember-routing-htmlbars/tests/helpers/render_test.js +++ b/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'); }); diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js index 4bbae3c46e8..2fa35ce47d2 100644 --- a/packages/ember-testing/tests/acceptance_test.js +++ b/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", { diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js index 680a26a2696..172e439d203 100644 --- a/packages/ember-testing/tests/helpers_test.js +++ b/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 diff --git a/packages/ember-testing/tests/integration_test.js b/packages/ember-testing/tests/integration_test.js index 91da878efe0..a683e927538 100644 --- a/packages/ember-testing/tests/integration_test.js +++ b/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", { diff --git a/packages/ember-views/lib/views/bound_view.js b/packages/ember-views/lib/views/bound_view.js index a74cf9f1b94..bad0b9f1d42 100644 --- a/packages/ember-views/lib/views/bound_view.js +++ b/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; } diff --git a/packages/ember-views/lib/views/select.js b/packages/ember-views/lib/views/select.js index a4ec6346dd6..a68b58b7954 100644 --- a/packages/ember-views/lib/views/select.js +++ b/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', diff --git a/packages/ember-views/lib/views/simple_bound_view.js b/packages/ember-views/lib/views/simple_bound_view.js index 61357510793..1379efe38b8 100644 --- a/packages/ember-views/lib/views/simple_bound_view.js +++ b/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; diff --git a/packages/ember-views/tests/views/metamorph_view_test.js b/packages/ember-views/tests/views/metamorph_view_test.js index a4a5abb6b2f..1a2f2afc15e 100644 --- a/packages/ember-views/tests/views/metamorph_view_test.js +++ b/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; diff --git a/packages/ember-views/tests/views/view/nested_view_ordering_test.js b/packages/ember-views/tests/views/view/nested_view_ordering_test.js index 4a3a0146dbb..1d7fbe88e7e 100644 --- a/packages/ember-views/tests/views/view/nested_view_ordering_test.js +++ b/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; diff --git a/packages/ember-views/tests/views/view/render_test.js b/packages/ember-views/tests/views/view/render_test.js index e2cee600743..258bae6b462 100644 --- a/packages/ember-views/tests/views/view/render_test.js +++ b/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; diff --git a/packages/ember-views/tests/views/view/template_test.js b/packages/ember-views/tests/views/view/template_test.js index 22b195c8d52..549ce673b1c 100644 --- a/packages/ember-views/tests/views/view/template_test.js +++ b/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() { diff --git a/packages/ember/lib/main.js b/packages/ember/lib/main.js index e90bc9f4a3c..bf4699c2b69 100644 --- a/packages/ember/lib/main.js +++ b/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"; diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js index 9764b44eea5..859e1e0c86f 100644 --- a/packages/ember/tests/component_registration_test.js +++ b/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; diff --git a/packages/ember/tests/helpers/helper_registration_test.js b/packages/ember/tests/helpers/helper_registration_test.js index 8b1f97288bf..55c993e2f09 100644 --- a/packages/ember/tests/helpers/helper_registration_test.js +++ b/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; diff --git a/packages/ember/tests/helpers/link_to_test.js b/packages/ember/tests/helpers/link_to_test.js index 49f925311db..3a64704e93b 100644 --- a/packages/ember/tests/helpers/link_to_test.js +++ b/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; diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js index 8872babbf21..82b68299bbb 100644 --- a/packages/ember/tests/homepage_example_test.js +++ b/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; diff --git a/packages/ember/tests/routing/basic_test.js b/packages/ember/tests/routing/basic_test.js index 426e0678862..f06616cc337 100644 --- a/packages/ember/tests/routing/basic_test.js +++ b/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; diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js index 3832451d807..feed124d71a 100644 --- a/packages/ember/tests/routing/query_params_test.js +++ b/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; diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js index d9180c71c0b..2777271d188 100644 --- a/packages/ember/tests/routing/substates_test.js +++ b/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; diff --git a/tests/index.html b/tests/index.html index 21d033bab10..1b9a92e1d37 100644 --- a/tests/index.html +++ b/tests/index.html @@ -5,7 +5,6 @@ Ember -