diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4c47ae849..80a976346 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -103,7 +103,7 @@ Every issue should be assigned one of these. ![](https://img.shields.io/badge/scope-compiler-cc0077.svg) ![](https://img.shields.io/badge/scope-runtime-eebb00.svg) ![](https://img.shields.io/badge/scope-core%20taglib-00cccc.svg) -![](https://img.shields.io/badge/scope-widgets-9900aa.svg) +![](https://img.shields.io/badge/scope-components-9900aa.svg) ![](https://img.shields.io/badge/scope-tools-fef2c0.svg) What part of the Marko stack does this issue apply to? In most cases there should only be one of these. @@ -112,7 +112,7 @@ What part of the Marko stack does this issue apply to? In most cases there shoul - **compiler**: Relates to the compiler (server only) - **runtime**: Relates to the runtime (isomorphic/universal) - **core-taglib**: Relates to custom tags that ship with Marko -- **widgets**: Relates to `marko-widgets` +- **components**: Relates to `marko-components` - **tools**: Relates to editor plugins, commandline tools, etc. ### Difficulty diff --git a/CHANGELOG.md b/CHANGELOG.md index 74e353665..bfd89847a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -124,7 +124,7 @@ require('marko/node-require').install({ ### 3.7.4 -- Fixed [#339](https://github.com/marko-js/marko/issues/339) - Tag transformers are not being applied to tags with a dynamic tag name (fixes [#146](https://github.com/marko-js/marko-widgets/issues/146) for Marko Widgets) +- Fixed [#339](https://github.com/marko-js/marko/issues/339) - Tag transformers are not being applied to tags with a dynamic tag name (fixes [#146](https://github.com/marko-js/marko-components/issues/146) for Marko Components) ### 3.7.3 diff --git a/README.md b/README.md index 3a577d260..b14bfb7f1 100644 --- a/README.md +++ b/README.md @@ -179,22 +179,22 @@ template.stream(templateData).pipe(process.stdout); # UI Components -Marko Widgets is a minimalist library for building isomorphic/universal UI components with the help of the -[Marko templating engine](http://markojs.com/docs/). Marko renders the HTML for UI components, while Marko Widgets adds client-side behavior. Client-side behavior includes the following: +Marko Components is a minimalist library for building isomorphic/universal UI components with the help of the +[Marko templating engine](http://markojs.com/docs/). Marko renders the HTML for UI components, while Marko Components adds client-side behavior. Client-side behavior includes the following: - Handling DOM events - Emitting custom events -- Handling custom events emitted by other widgets +- Handling custom events emitted by other components - Manipulating and updating the DOM -Marko Widgets offers advanced features like DOM-diffing, batched updates, stateful widgets, declarative event binding and efficient event delegation. +Marko Components offers advanced features like DOM-diffing, batched updates, stateful components, declarative event binding and efficient event delegation. -Changing a widgets state or properties will result in the DOM automatically being updated without writing extra code. Marko Widgets has adopted many of the good design principles promoted by the [React](https://facebook.github.io/react/index.html) team, but aims to be much lighter and often faster (especially on the server). When updating the view for a widget, Marko Widgets uses DOM diffing to make the minimum number of changes to the DOM through the use of the [morphdom](https://github.com/patrick-steele-idem/morphdom) module. +Changing a components state or properties will result in the DOM automatically being updated without writing extra code. Marko Components has adopted many of the good design principles promoted by the [React](https://facebook.github.io/react/index.html) team, but aims to be much lighter and often faster (especially on the server). When updating the view for a component, Marko Components uses DOM diffing to make the minimum number of changes to the DOM through the use of the [morphdom](https://github.com/patrick-steele-idem/morphdom) module. UI components are defined using very clean JavaScript code. For example: ```javascript -module.exports = require('marko-widgets').defineComponent({ +module.exports = require('marko-components').defineComponent({ /** * The template to use as the view */ @@ -213,7 +213,7 @@ module.exports = require('marko-widgets').defineComponent({ /** * Return an object that is used as the template data. The - * template data should be based on the current widget state + * template data should be based on the current component state * that is passed in as the first argument */ getTemplateData: function(state) { @@ -228,13 +228,13 @@ module.exports = require('marko-widgets').defineComponent({ }, /** - * This is the constructor for the widget. Called once when - * the widget is first added to the DOM. + * This is the constructor for the component. Called once when + * the component is first added to the DOM. */ init: function() { var el = this.el; // "el" will be reference the raw HTML element that this - // widget is bound to. You can do whatever you want with it... + // component is bound to. You can do whatever you want with it... // el.style.color = 'red'; }, @@ -272,9 +272,9 @@ And, here is the corresponding Marko template for the UI component: ``` -Try Marko Widgets Online! +Try Marko Components Online! -For more details on Marko Widgets, please check out the [Marko Widgets Documentation](http://markojs.com/docs/marko-widgets/). +For more details on Marko Components, please check out the [Marko Components Documentation](http://markojs.com/docs/marko-components/). # Common issues diff --git a/ROADMAP.md b/ROADMAP.md index 038189361..31bece93e 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -51,13 +51,13 @@ You can easily `require`/`import` a single file component and interact with it u ```js var myCounter = require('./src/components/my-counter'); -var widget = myCounter.renderSync({ +var component = myCounter.renderSync({ value: 10 }) .appendTo(document.body) - .getWidget(); + .getComponent(); -widget.increment(); +component.increment(); ``` Of course, a single file component can also be embedded in another template as a custom tag: @@ -131,17 +131,17 @@ The VDOM output allows optimizations that were previously not possible: Our initial benchmarks show a significant improvement in rendering time and we are consistently outperforming React. The independent [morphdom](https://github.com/patrick-steele-idem/morphdom) library has been tweaked to support diffing with both a real DOM and a Marko virtual DOM. -### Merge in Marko Widgets ([#390](https://github.com/marko-js/marko/issues/390)) +### Merge in Marko Components ([#390](https://github.com/marko-js/marko/issues/390)) A big part of this release is a shift in focus from Marko being merely a templating language to a complete UI library. As such, we are providing first-class support for components. -You will no longer need to install `marko-widgets` as an external library, and there is more cohesion between the templates and components/widgets. +You will no longer need to install `marko-components` as an external library, and there is more cohesion between the templates and components/components. ### Improved component lifecycle methods ([#396](https://github.com/marko-js/marko/issues/396)) - `getInitialState()` ➔ `onInput(input)` -- `getWidgetConfig()` ➔ `onInput(input)` +- `getComponentConfig()` ➔ `onInput(input)` - `init(config)` ➔ `onMount()` - `getTemplateData(input, state)` ➔ (no longer needed) - `getInitialProps(input)` ➔ (no longer needed) @@ -167,7 +167,7 @@ class { } onRender(out) { - // Called for every render. This widget + // Called for every render. This component // may or may not be mounted. // During render we have access to the `out`. console.log('The template is about to be rendered!'); @@ -204,7 +204,7 @@ class { } ``` -### Automatically watch widget state object for changes ([#406](https://github.com/marko-js/marko/issues/406)) +### Automatically watch component state object for changes ([#406](https://github.com/marko-js/marko/issues/406)) **Old:** @@ -675,7 +675,7 @@ or, with the non-concise syntax: **New:** ```html -
+
...
``` @@ -683,13 +683,13 @@ or, with the non-concise syntax: Or, applied as a tag (see next: multiple top level DOM elements): ```html -'); + '(function(){var w=window;w.$components=(w.$components||[]).concat(' + + warp10.stringify(renderedComponents).replace(escapeEndingScriptTagRegExp, '\\u003C/') + + ')||w.$components})()'); - widgetsContext.$__clearWidgets(); + componentsContext.$__clearComponents(); } -exports.writeInitWidgetsCode = writeInitWidgetsCode; +exports.writeInitComponentsCode = writeInitComponentsCode; /** * Returns an object that can be sent to the browser using JSON.stringify. The parsed object should be - * passed to require('marko-widgets').initWidgets(...); + * passed to require('marko-components').initComponents(...); * - * @param {WidgetsContext|AsyncWriter} widgetsContext A WidgetsContext or an AsyncWriter - * @return {Object} An object with information about the rendered widgets that can be serialized to JSON. The object should be treated as opaque + * @param {ComponentsContext|AsyncWriter} componentsContext A ComponentsContext or an AsyncWriter + * @return {Object} An object with information about the rendered components that can be serialized to JSON. The object should be treated as opaque */ -exports.getRenderedWidgets = function(widgetsContext) { - if (!(widgetsContext instanceof WidgetsContext)) { - // Assume that the provided "widgetsContext" argument is +exports.getRenderedComponents = function(componentsContext) { + if (!(componentsContext instanceof ComponentsContext)) { + // Assume that the provided "componentsContext" argument is // actually an AsyncWriter - var out = widgetsContext; + var out = componentsContext; if (!out.global) { - throw new Error('Invalid argument: ' + widgetsContext); + throw new Error('Invalid argument: ' + componentsContext); } - widgetsContext = WidgetsContext.$__getWidgetsContext(out); + componentsContext = ComponentsContext.$__getComponentsContext(out); } - var renderedWidgets = getRenderedWidgets(widgetsContext); - return warp10.stringifyPrepare(renderedWidgets); + var renderedComponents = getRenderedComponents(componentsContext); + return warp10.stringifyPrepare(renderedComponents); }; exports.r = require('./renderer'); -exports.w = function() { /* no op for defining a widget on teh server */ }; +exports.c = function() { /* no op for defining a component on teh server */ }; -// registerWidget is a no-op on the server. -// Fixes https://github.com/marko-js/marko-widgets/issues/111 -exports.rw = function(typeName) { return typeName; }; +// registerComponent is a no-op on the server. +// Fixes https://github.com/marko-js/marko-components/issues/111 +exports.rc = function(typeName) { return typeName; }; diff --git a/components/init-components-browser.js b/components/init-components-browser.js index d14a2f13c..b457a03af 100644 --- a/components/init-components-browser.js +++ b/components/init-components-browser.js @@ -4,20 +4,20 @@ var eventDelegation = require('./event-delegation'); var win = window; var defaultDocument = document; var events = require('../runtime/events'); -var widgetsUtil = require('./util'); -var widgetLookup = widgetsUtil.$__widgetLookup; -var getElementById = widgetsUtil.$__getElementById; -var WidgetDef = require('./WidgetDef'); +var componentsUtil = require('./util'); +var componentLookup = componentsUtil.$__componentLookup; +var getElementById = componentsUtil.$__getElementById; +var ComponentDef = require('./ComponentDef'); // var extend = require('raptor-util/extend'); // var registry = require('./registry'); -function invokeWidgetEventHandler(widget, targetMethodName, args) { - var method = widget[targetMethodName]; +function invokeComponentEventHandler(component, targetMethodName, args) { + var method = component[targetMethodName]; if (!method) { throw Error('Method not found: ' + targetMethodName); } - method.apply(widget, args); + method.apply(component, args); } function addEventListenerHelper(el, eventType, listener) { @@ -27,79 +27,79 @@ function addEventListenerHelper(el, eventType, listener) { }; } -function addDOMEventListeners(widget, el, eventType, targetMethodName, extraArgs, handles) { +function addDOMEventListeners(component, el, eventType, targetMethodName, extraArgs, handles) { var removeListener = addEventListenerHelper(el, eventType, function(event) { var args = [event, el]; if (extraArgs) { args = extraArgs.concat(args); } - invokeWidgetEventHandler(widget, targetMethodName, args); + invokeComponentEventHandler(component, targetMethodName, args); }); handles.push(removeListener); } -function initWidget(widgetDef, doc) { - var widget = widgetDef.$__widget; +function initComponent(componentDef, doc) { + var component = componentDef.$__component; - if (!widget || !widget.$__isWidget) { + if (!component || !component.$__isComponent) { return; // legacy } - var scope = widgetDef.$__scope; - var domEvents = widgetDef.$__domEvents; - var customEvents = widgetDef.$__customEvents; + var scope = componentDef.$__scope; + var domEvents = componentDef.$__domEvents; + var customEvents = componentDef.$__customEvents; - widget.$__reset(); - widget.$__document = doc; + component.$__reset(); + component.$__document = doc; - var isExisting = widgetDef.$__isExisting; + var isExisting = componentDef.$__isExisting; var i; var len; var eventType; var targetMethodName; var extraArgs; - var id = widget.id; + var id = component.id; - var rootIds = widgetDef.$__roots; + var rootIds = componentDef.$__roots; if (rootIds) { - var rootWidgets; + var rootComponents; var els = []; for (i=0, len=rootIds.length; i} widgetDefs An array of WidgetDef instances + * This method is used to initialized components associated with UI components + * rendered in the browser. While rendering UI components a "components context" + * is added to the rendering context to keep up with which components are rendered. + * When ready, the components can then be initialized by walking the component tree + * in the components context (nested components are initialized before ancestor components). + * @param {Array} componentDefs An array of ComponentDef instances */ -function initClientRendered(widgetDefs, doc) { +function initClientRendered(componentDefs, doc) { // Ensure that event handlers to handle delegating events are - // always attached before initializing any widgets + // always attached before initializing any components eventDelegation.$__init(doc); doc = doc || defaultDocument; - for (var i=0,len=widgetDefs.length; i { - event.insertCode(widgetArgsFunctionCall); + event.insertCode(componentArgsFunctionCall); }); el.onAfterGenerateCode((event) => { - event.insertCode(cleanupWidgetArgsFunctionCall); + event.insertCode(cleanupComponentArgsFunctionCall); }); } } - buildCleanupWidgetArgsFunctionCall(transformHelper) { + buildCleanupComponentArgsFunctionCall(transformHelper) { var context = transformHelper.context; var builder = transformHelper.builder; - var cleanupWidgetArgsVar = context.addStaticVar('marko_cleanupWidgetArgs', - 'marko_widgetArgs.cleanup'); + var cleanupComponentArgsVar = context.addStaticVar('marko_cleanupComponentArgs', + 'marko_componentArgs.cleanup'); - return builder.functionCall(cleanupWidgetArgsVar, [builder.identifierOut()]); + return builder.functionCall(cleanupComponentArgsVar, [builder.identifierOut()]); } } -module.exports = WidgetArgs; \ No newline at end of file +module.exports = ComponentArgs; \ No newline at end of file diff --git a/components/taglib/TransformHelper/assignComponentId.js b/components/taglib/TransformHelper/assignComponentId.js index e4d61977c..6ce2b813c 100644 --- a/components/taglib/TransformHelper/assignComponentId.js +++ b/components/taglib/TransformHelper/assignComponentId.js @@ -1,33 +1,33 @@ 'use strict'; -module.exports = function assignWidgetId(isRepeated) { +module.exports = function assignComponentId(isRepeated) { // First check if we have already assigned an ID to thie element - var widgetIdInfo = this.widgetIdInfo; + var componentIdInfo = this.componentIdInfo; - if (widgetIdInfo) { - return this.widgetIdInfo; + if (componentIdInfo) { + return this.componentIdInfo; } var el = this.el; var context = this.context; var builder = this.builder; - let widgetRef; + let componentRef; var nestedIdExpression; var idExpression; - if (!this.hasBoundWidgetForTemplate()) { - // We are assigning a widget ID to a nested widget in a template that does not have a widget. - // That means we do not have access to the parent widget variable as part of a closure. We + if (!this.hasBoundComponentForTemplate()) { + // We are assigning a component ID to a nested component in a template that does not have a component. + // That means we do not have access to the parent component variable as part of a closure. We // need to look it up out of the `out.data` map - if (!context.isFlagSet('hasWidgetVar')) { - context.setFlag('hasWidgetVar'); + if (!context.isFlagSet('hasComponentVar')) { + context.setFlag('hasComponentVar'); - var getCurrentWidgetVar = context.importModule('marko_getCurrentWidget', - this.getMarkoWidgetsRequirePath('marko/widgets/taglib/helpers/getCurrentWidget')); + var getCurrentComponentVar = context.importModule('marko_getCurrentComponent', + this.getMarkoComponentsRequirePath('marko/components/taglib/helpers/getCurrentComponent')); - context.addVar('widget', builder.functionCall(getCurrentWidgetVar, [builder.identifierOut()])); + context.addVar('component', builder.functionCall(getCurrentComponentVar, [builder.identifierOut()])); } } @@ -46,35 +46,35 @@ module.exports = function assignWidgetId(isRepeated) { var isCustomTag = el.type !== 'HtmlElement'; if (el.hasAttribute('key')) { - widgetRef = el.getAttributeValue('key'); + componentRef = el.getAttributeValue('key'); el.removeAttribute('key'); } else if (el.hasAttribute('ref')) { context.deprecate('The "ref" attribute is deprecated. Please use "key" instead.'); - widgetRef = el.getAttributeValue('ref'); + componentRef = el.getAttributeValue('ref'); el.removeAttribute('ref'); } if (el.hasAttribute('w-id')) { context.deprecate('The "w-id" attribute is deprecated. Please use "key" instead.'); - if (widgetRef) { + if (componentRef) { this.addError('The "w-id" attribute cannot be used in conjuction with the "ref" or "key" attributes.'); return; } - widgetRef = el.getAttributeValue('w-id'); + componentRef = el.getAttributeValue('w-id'); el.removeAttribute('w-id'); } - if (widgetRef) { - idExpression = this.buildWidgetElIdFunctionCall(widgetRef); + if (componentRef) { + idExpression = this.buildComponentElIdFunctionCall(componentRef); - nestedIdExpression = widgetRef; + nestedIdExpression = componentRef; if (isCustomTag) { // The element is a custom tag - this.getWidgetArgs().setId(nestedIdExpression); + this.getComponentArgs().setId(nestedIdExpression); } else { if (el.hasAttribute('id')) { this.addError('The "ref", "key", and "w-id" attributes cannot be used in conjuction with the "id" attribute.'); @@ -85,9 +85,9 @@ module.exports = function assignWidgetId(isRepeated) { } else if (el.hasAttribute('id')) { idExpression = el.getAttributeValue('id'); - if (el.isFlagSet('hasWidgetBind')) { - // We have to attach a listener to the root element of the widget - // We will use an empty string as an indicator that it is the root widget + if (el.isFlagSet('hasComponentBind')) { + // We have to attach a listener to the root element of the component + // We will use an empty string as an indicator that it is the root component // element. nestedIdExpression = builder.literal(''); } else { @@ -103,10 +103,10 @@ module.exports = function assignWidgetId(isRepeated) { nestedIdExpression = isRepeated ? builder.literal(uniqueElId + '[]') : builder.literal(uniqueElId); - idExpression = this.buildWidgetElIdFunctionCall(nestedIdExpression); + idExpression = this.buildComponentElIdFunctionCall(nestedIdExpression); if (isCustomTag) { - this.getWidgetArgs().setId(nestedIdExpression); + this.getComponentArgs().setId(nestedIdExpression); } else { el.setAttributeValue('id', idExpression); } @@ -114,7 +114,7 @@ module.exports = function assignWidgetId(isRepeated) { var transformHelper = this; - this.widgetIdInfo = { + this.componentIdInfo = { idExpression: idExpression, nestedIdExpression: nestedIdExpression, idVarNode: null, @@ -124,7 +124,7 @@ module.exports = function assignWidgetId(isRepeated) { } let uniqueElId = transformHelper.nextUniqueId(); - let idVarName = '__widgetId' + uniqueElId; + let idVarName = '__componentId' + uniqueElId; let idVar = builder.identifier(idVarName); this.idVarNode = builder.vars([ @@ -141,7 +141,7 @@ module.exports = function assignWidgetId(isRepeated) { idVar); if (isCustomTag) { - transformHelper.getWidgetArgs().setId(nestedIdExpression); + transformHelper.getComponentArgs().setId(nestedIdExpression); } else { el.setAttributeValue('id', idExpression); } @@ -150,5 +150,5 @@ module.exports = function assignWidgetId(isRepeated) { } }; - return this.widgetIdInfo; + return this.componentIdInfo; }; diff --git a/components/taglib/TransformHelper/handleComponentBind.js b/components/taglib/TransformHelper/handleComponentBind.js index d1fe0da68..cb073f6f8 100644 --- a/components/taglib/TransformHelper/handleComponentBind.js +++ b/components/taglib/TransformHelper/handleComponentBind.js @@ -17,14 +17,14 @@ function isTemplateMainEntry(context) { return filename === 'index'; } -function checkCombinedComponent(widgetModulePath) { - let filename = path.basename(widgetModulePath); +function checkCombinedComponent(componentModulePath) { + let filename = path.basename(componentModulePath); let ext = path.extname(filename); if (ext) { filename = filename.slice(0, 0 - ext.length); } - return filename !== 'widget'; + return filename !== 'component'; } function checkSplitComponent(context) { @@ -38,7 +38,7 @@ function checkIsInnerBind(el) { var curNode = el; while (true) { - if (curNode.data.hasBoundWidget) { + if (curNode.data.hasBoundComponent) { return true; } @@ -52,20 +52,20 @@ function checkIsInnerBind(el) { return false; } -module.exports = function handleWidgetBind() { +module.exports = function handleComponentBind() { let el = this.el; let context = this.context; let builder = this.builder; - let internalBindAttr = el.getAttribute('_widgetbind'); + let internalBindAttr = el.getAttribute('_componentbind'); let bindAttr = el.getAttribute('w-bind'); let bindAttrValue; if (internalBindAttr == null && bindAttr == null) { return; } else if (bindAttr != null) { - context.deprecate('Legacy widgets using w-bind and defineRenderer/defineWidget or defineComponent are deprecated. See: https://github.com/marko-js/marko/issues/421'); - this.isLegacyWidget = true; + context.deprecate('Legacy components using w-bind and defineRenderer/defineComponent or defineComponent are deprecated. See: https://github.com/marko-js/marko/issues/421'); + this.isLegacyComponent = true; // Remove the w-bind attribute since we don't want it showing up in the output DOM el.removeAttribute('w-bind'); @@ -73,20 +73,20 @@ module.exports = function handleWidgetBind() { // Read the value for the w-bind attribute. This will be an AST node for the parsed JavaScript bindAttrValue = bindAttr.value; } else if (internalBindAttr != null) { - el.removeAttribute('_widgetbind'); + el.removeAttribute('_componentbind'); } - this.setHasBoundWidgetForTemplate(); + this.setHasBoundComponentForTemplate(); var isInnerBind = checkIsInnerBind(el.parentNode); - el.data.hasBoundWidget = true; + el.data.hasBoundComponent = true; - // A widget is bound to the el... + // A component is bound to the el... let modulePath; - var widgetProps = isInnerBind ? {} : this.getWidgetProps(); + var componentProps = isInnerBind ? {} : this.getComponentProps(); let isMain = isTemplateMainEntry(context); let transformHelper = this; @@ -97,19 +97,19 @@ module.exports = function handleWidgetBind() { let isRendererExport; let rendererPath; - const hasWidgetTypes = context.isFlagSet('hasWidgetTypes'); + const hasComponentTypes = context.isFlagSet('hasComponentTypes'); - if (hasWidgetTypes) { - context.deprecate('The tag is deprecated. Please remove it. See: https://github.com/marko-js/marko/issues/514'); + if (hasComponentTypes) { + context.deprecate('The tag is deprecated. Please remove it. See: https://github.com/marko-js/marko/issues/514'); } if (bindAttrValue == null) { if (inlineComponent) { modulePath = context.filename; } else { - modulePath = this.getDefaultWidgetModule(); + modulePath = this.getDefaultComponentModule(); if (!modulePath) { - this.addError('No corresponding JavaScript module found in the same directory (either "widget.js" or "index.js"). Actual: ' + modulePath); + this.addError('No corresponding JavaScript module found in the same directory (either "component.js" or "index.js"). Actual: ' + modulePath); return; } } @@ -120,18 +120,18 @@ module.exports = function handleWidgetBind() { return; } } else { - // This is a dynamic expression. The should have been found. - if (!hasWidgetTypes) { - this.addError('The tag must be used to declare widgets when the value of the "w-bind" attribute is a dynamic expression.'); + // This is a dynamic expression. The should have been found. + if (!hasComponentTypes) { + this.addError('The tag must be used to declare components when the value of the "w-bind" attribute is a dynamic expression.'); return; } el.insertSiblingBefore( builder.functionCall( - builder.memberExpression(builder.identifier('widget'), builder.identifier('t')), + builder.memberExpression(builder.identifier('component'), builder.identifier('t')), [ builder.memberExpression( - builder.identifier('marko_widgetTypes'), + builder.identifier('marko_componentTypes'), bindAttrValue, true /* computed */) ])); @@ -162,30 +162,30 @@ module.exports = function handleWidgetBind() { } if (modulePath) { - let widgetTypeNode; + let componentTypeNode; - var widgetPath = modulePath; - var widgetTypeImport; + var componentPath = modulePath; + var componentTypeImport; if (isMain && isComponentExport) { - widgetPath = './' + path.basename(context.filename); - widgetTypeImport = builder.functionDeclaration(null, [], [ + componentPath = './' + path.basename(context.filename); + componentTypeImport = builder.functionDeclaration(null, [], [ builder.returnStatement(builder.memberExpression(builder.identifier('module'), builder.identifier('exports'))) ]); } - context.addDependency({ type:'require', path:widgetPath }); - context.addDependency({ type:'require', path:'marko/widgets' }); + context.addDependency({ type:'require', path:componentPath }); + context.addDependency({ type:'require', path:'marko/components' }); - widgetTypeNode = context.addStaticVar('marko_widgetType', this.buildWidgetTypeNode(widgetPath, widgetTypeImport)); + componentTypeNode = context.addStaticVar('marko_componentType', this.buildComponentTypeNode(componentPath, componentTypeImport)); - widgetProps.type = widgetTypeNode; + componentProps.type = componentTypeNode; } if (el.hasAttribute('w-config')) { el.insertSiblingBefore( builder.functionCall( - builder.memberExpression(builder.identifier('widget'), builder.identifier('c')), + builder.memberExpression(builder.identifier('component'), builder.identifier('c')), [ el.getAttributeValue('w-config') ])); @@ -196,37 +196,37 @@ module.exports = function handleWidgetBind() { let id = el.getAttributeValue('id'); if (id) { - widgetProps.id = id; + componentProps.id = id; } if (isInnerBind) { - // let widgetOptionsVar = context.addStaticVar( - // 'widgetOptions', + // let componentOptionsVar = context.addStaticVar( + // 'componentOptions', // builder.functionCall( - // builder.memberExpression(transformHelper.markoWidgetsVar, builder.identifier('r')), + // builder.memberExpression(transformHelper.markoComponentsVar, builder.identifier('r')), // [ // builder.renderBodyFunction([el]), - // builder.literal(widgetProps) + // builder.literal(componentProps) // ])); // - // widgetProps._ = widgetOptionsVar; + // componentProps._ = componentOptionsVar; el.setAttributeValue('id', builder.memberExpression( - builder.identifier('widget'), + builder.identifier('component'), builder.identifier('id'))); // TODO Deprecation warning for inner binds - let widgetNode = context.createNodeForEl('_widget', { - props: builder.literal(widgetProps) + let componentNode = context.createNodeForEl('_component', { + props: builder.literal(componentProps) }); - el.wrapWith(widgetNode); + el.wrapWith(componentNode); return; } if (this.firstBind) { this.context.on('beforeGenerateCode:TemplateRoot', function(eventArgs) { - eventArgs.node.addRenderFunctionParam(builder.identifier('widget')); + eventArgs.node.addRenderFunctionParam(builder.identifier('component')); eventArgs.node.addRenderFunctionParam(builder.identifier('state')); eventArgs.node.generateAssignRenderCode = function(eventArgs) { let nodes = []; @@ -236,7 +236,7 @@ module.exports = function handleWidgetBind() { var createRendererArgs = [ renderFunctionVar, - builder.literal(widgetProps) + builder.literal(componentProps) ]; if (renderingLogic) { @@ -246,14 +246,14 @@ module.exports = function handleWidgetBind() { nodes.push(builder.assignment( templateRendererMember, builder.functionCall( - builder.memberExpression(transformHelper.markoWidgetsVar, builder.identifier('r')), + builder.memberExpression(transformHelper.markoComponentsVar, builder.identifier('r')), createRendererArgs))); if (inlineComponent || isComponentExport) { nodes.push(builder.assignment( - builder.memberExpression(templateVar, builder.identifier('Widget')), + builder.memberExpression(templateVar, builder.identifier('Component')), builder.functionCall( - builder.memberExpression(transformHelper.markoWidgetsVar, builder.identifier('w')), + builder.memberExpression(transformHelper.markoComponentsVar, builder.identifier('w')), [ renderingLogic, templateRendererMember @@ -265,36 +265,36 @@ module.exports = function handleWidgetBind() { }); } - // let widgetNode = el.data.widgetNode; + // let componentNode = el.data.componentNode; // - // if (widgetNode) { - // widgetNode.setAttributeValues(widgetProps); + // if (componentNode) { + // componentNode.setAttributeValues(componentProps); // } else { - // widgetNode = context.createNodeForEl('_widget', widgetProps); - // el.wrapWith(widgetNode); + // componentNode = context.createNodeForEl('_component', componentProps); + // el.wrapWith(componentNode); // } if (el.hasAttribute('key')) { - if (!widgetProps.roots) { - widgetProps.roots = []; + if (!componentProps.roots) { + componentProps.roots = []; } var key = el.getAttributeValue('key'); - widgetProps.roots.push(key); + componentProps.roots.push(key); } else if (el.hasAttribute('ref')) { - if (!widgetProps.roots) { - widgetProps.roots = []; + if (!componentProps.roots) { + componentProps.roots = []; } var ref = el.getAttributeValue('ref'); - widgetProps.roots.push(ref); + componentProps.roots.push(ref); } else { el.setAttributeValue('id', builder.memberExpression( - builder.identifier('widget'), + builder.identifier('component'), builder.identifier('id'))); } - // this.widgetStack.push({ - // widgetNode: widgetNode, + // this.componentStack.push({ + // componentNode: componentNode, // el: el, // extend: false // }); diff --git a/components/taglib/TransformHelper/handleComponentEvents.js b/components/taglib/TransformHelper/handleComponentEvents.js index 3f78b4822..7c894fc70 100644 --- a/components/taglib/TransformHelper/handleComponentEvents.js +++ b/components/taglib/TransformHelper/handleComponentEvents.js @@ -19,15 +19,15 @@ function isUpperCase(c) { function addBubblingEventListener(transformHelper, eventType, targetMethod, extraArgs) { var el = transformHelper.el; - if (transformHelper.hasBoundWidgetForTemplate() === false) { - transformHelper.addError('Unable to handle event ' + eventType + '. HTML element is not nested within a widget.'); + if (transformHelper.hasBoundComponentForTemplate() === false) { + transformHelper.addError('Unable to handle event ' + eventType + '. HTML element is not nested within a component.'); return; } var builder = transformHelper.builder; var addBubblingEventMethod = builder.memberExpression( - builder.identifier('widget'), + builder.identifier('component'), builder.identifier('d')); var addBubblingEventArgs = [ @@ -46,7 +46,7 @@ function addBubblingEventListener(transformHelper, eventType, targetMethod, extr if (!transformHelper.context.data[ATTACH_DETACH_KEY]) { transformHelper.context.data[ATTACH_DETACH_KEY] = true; - let requireFuncCall = builder.require(builder.literal('marko/widgets/attach-detach')); + let requireFuncCall = builder.require(builder.literal('marko/components/attach-detach')); transformHelper.context.addStaticCode(requireFuncCall); } @@ -58,16 +58,16 @@ function addDirectEventListener(transformHelper, eventType, targetMethod, extraA var el = transformHelper.el; var addDomEvent = builder.memberExpression( - builder.identifier('widget'), + builder.identifier('component'), builder.identifier('e')); - let widgetIdInfo = transformHelper.assignWidgetId(true /* repeated */); - let idVarNode = widgetIdInfo.idVarNode ? null : widgetIdInfo.createIdVarNode(); + let componentIdInfo = transformHelper.assignComponentId(true /* repeated */); + let idVarNode = componentIdInfo.idVarNode ? null : componentIdInfo.createIdVarNode(); var helperArgs = [ eventType, targetMethod, - widgetIdInfo.idExpression + componentIdInfo.idExpression ]; if (extraArgs) { @@ -87,17 +87,17 @@ function addDirectEventListener(transformHelper, eventType, targetMethod, extraA function addCustomEventListener(transformHelper, eventType, targetMethod, extraArgs) { var builder = transformHelper.builder; - // Make sure the widget has an assigned scope ID so that we can bind the custom event listener - var widgetArgs = transformHelper.getWidgetArgs(); + // Make sure the component has an assigned scope ID so that we can bind the custom event listener + var componentArgs = transformHelper.getComponentArgs(); if (extraArgs) { extraArgs = builder.arrayExpression(extraArgs); } - widgetArgs.addCustomEvent(eventType, targetMethod, extraArgs); + componentArgs.addCustomEvent(eventType, targetMethod, extraArgs); } -module.exports = function handleWidgetEvents() { +module.exports = function handleComponentEvents() { var el = this.el; var builder = this.builder; var context = this.context; @@ -106,9 +106,9 @@ module.exports = function handleWidgetEvents() { // have one or more attributes that match the "w-on*" pattern. // We still need to loop over the properties to find and handle // the properties corresponding to those attributes. - var hasWidgetEvents = this.el.isFlagSet('hasWidgetEvents') === true; + var hasComponentEvents = this.el.isFlagSet('hasComponentEvents') === true; - if (hasWidgetEvents) { + if (hasComponentEvents) { var attrs = el.getAttributes().concat([]); attrs.forEach((attr) => { @@ -152,7 +152,7 @@ module.exports = function handleWidgetEvents() { el.removeAttribute(attrName); if (isCustomTag) { - this.assignWidgetId(true /* repeated */); + this.assignComponentId(true /* repeated */); // We are adding an event listener for a custom event (not a DOM event) if (eventType.startsWith('-')) { @@ -192,7 +192,7 @@ module.exports = function handleWidgetEvents() { // that can be used to handle the event. We will add // a "data-w-on{eventType}" attribute to the output HTML // for this element that will be used to map the event - // to a method on the containing widget. + // to a method on the containing component. addBubblingEventListener(this, eventType, targetMethod, extraArgs); } else { // The event does not bubble so we must attach a DOM diff --git a/components/taglib/TransformHelper/handleComponentFor.js b/components/taglib/TransformHelper/handleComponentFor.js index ad007fe08..a1209407a 100644 --- a/components/taglib/TransformHelper/handleComponentFor.js +++ b/components/taglib/TransformHelper/handleComponentFor.js @@ -1,29 +1,29 @@ -module.exports = function handleWidgetFor() { +module.exports = function handleComponentFor() { var el = this.el; var context = this.context; - var widgetFor; + var componentFor; if (el.hasAttribute('for-ref')) { context.deprecate('The "for-ref" tag is deprecated. Please use "for-key" instead.'); - widgetFor = el.getAttributeValue('for-ref'); + componentFor = el.getAttributeValue('for-ref'); el.removeAttribute('for-ref'); } else if (el.hasAttribute('for-key')) { - widgetFor = el.getAttributeValue('for-key'); + componentFor = el.getAttributeValue('for-key'); el.removeAttribute('for-key'); } if (el.hasAttribute('w-for')) { context.deprecate('The "w-for" tag is deprecated. Please use "for-ref" instead.'); - if (widgetFor) { + if (componentFor) { this.addError('The "w-for" tag cannot be used with "for-ref" or "for-key".'); return; } else { - widgetFor = el.getAttributeValue('w-for'); + componentFor = el.getAttributeValue('w-for'); } el.removeAttribute('w-for'); } - if (widgetFor == null) { + if (componentFor == null) { return; } @@ -33,6 +33,6 @@ module.exports = function handleWidgetFor() { } else { el.setAttributeValue( 'for', - this.buildWidgetElIdFunctionCall(widgetFor)); + this.buildComponentElIdFunctionCall(componentFor)); } }; diff --git a/components/taglib/TransformHelper/handleComponentPreserve.js b/components/taglib/TransformHelper/handleComponentPreserve.js index f0fc4f8cb..ad503147c 100644 --- a/components/taglib/TransformHelper/handleComponentPreserve.js +++ b/components/taglib/TransformHelper/handleComponentPreserve.js @@ -15,8 +15,8 @@ function addPreserve(transformHelper, bodyOnly, condition) { preserveAttrs['if'] = condition; } - let widgetIdInfo = transformHelper.assignWidgetId(true /* repeated */); - let idVarNode = widgetIdInfo.idVarNode ? null : widgetIdInfo.createIdVarNode(); + let componentIdInfo = transformHelper.assignComponentId(true /* repeated */); + let idVarNode = componentIdInfo.idVarNode ? null : componentIdInfo.createIdVarNode(); preserveAttrs.id = transformHelper.getIdExpression(); @@ -153,7 +153,7 @@ const preserveTypes = [ } ]; -module.exports = function handleWidgetPreserve() { +module.exports = function handleComponentPreserve() { let el = this.el; for (let i = 0; i < preserveTypes.length; i++) { diff --git a/components/taglib/TransformHelper/handleComponentPreserveAttrs.js b/components/taglib/TransformHelper/handleComponentPreserveAttrs.js index 100ae58c0..2ba04f0e5 100644 --- a/components/taglib/TransformHelper/handleComponentPreserveAttrs.js +++ b/components/taglib/TransformHelper/handleComponentPreserveAttrs.js @@ -1,6 +1,6 @@ const NO_UPDATE_ATTR_SUFFIX = ':no-update'; -function handleWidgetPreserveAttrs() { +function handleComponentPreserveAttrs() { var el = this.el; var context = this.context; var builder = context.builder; @@ -36,4 +36,4 @@ function handleWidgetPreserveAttrs() { } } -module.exports = handleWidgetPreserveAttrs; +module.exports = handleComponentPreserveAttrs; diff --git a/components/taglib/TransformHelper/handleIncludeNode.js b/components/taglib/TransformHelper/handleIncludeNode.js index b23c0ea45..c9c9189e9 100644 --- a/components/taglib/TransformHelper/handleIncludeNode.js +++ b/components/taglib/TransformHelper/handleIncludeNode.js @@ -1,11 +1,11 @@ 'use strict'; -var includeTagForWidgets = require.resolve('../include-tag'); +var includeTagForComponents = require.resolve('../include-tag'); module.exports = function(includeNode) { var context = this.context; - if (!this.hasBoundWidgetForTemplate()) { + if (!this.hasBoundComponentForTemplate()) { return; } @@ -19,26 +19,26 @@ module.exports = function(includeNode) { if (parentNode.childCount === 1) { if (includeNode.hasAttribute('key') || includeNode.hasAttribute('ref')) { - this.assignWidgetId(); + this.assignComponentId(); } let parentTransformHelper = this.getTransformHelper(parentNode); if (includeNode.data.bodySlot) { - parentTransformHelper.assignWidgetId(false /* not repeated */); - var widgetProps = this.getWidgetProps(); - widgetProps.body = parentTransformHelper.getNestedIdExpression(); + parentTransformHelper.assignComponentId(false /* not repeated */); + var componentProps = this.getComponentProps(); + componentProps.body = parentTransformHelper.getNestedIdExpression(); } else { - let widgetIdInfo = parentTransformHelper.assignWidgetId(true /* repeated */); - if (!widgetIdInfo.idVarNode) { - let idVarNode = widgetIdInfo.createIdVarNode(); + let componentIdInfo = parentTransformHelper.assignComponentId(true /* repeated */); + if (!componentIdInfo.idVarNode) { + let idVarNode = componentIdInfo.createIdVarNode(); parentNode.onBeforeGenerateCode((event) => { event.insertCode(idVarNode); }); } } - includeNode.setRendererPath(includeTagForWidgets); + includeNode.setRendererPath(includeTagForComponents); includeNode.onBeforeGenerateCode(function() { includeNode.addProp('_elId', parentTransformHelper.getIdExpression()); @@ -55,7 +55,7 @@ module.exports = function(includeNode) { // data = builder.literal(null); // } // - // let includeVar = context.importModule('marko_widget_include', this.getMarkoWidgetsRequirePath('marko/widgets/taglib/helpers/include')); + // let includeVar = context.importModule('marko_component_include', this.getMarkoComponentsRequirePath('marko/components/taglib/helpers/include')); // // let includeArgs = [ // target, diff --git a/components/taglib/TransformHelper/handleRootNodes.js b/components/taglib/TransformHelper/handleRootNodes.js index dbbb08928..7767fec54 100644 --- a/components/taglib/TransformHelper/handleRootNodes.js +++ b/components/taglib/TransformHelper/handleRootNodes.js @@ -94,7 +94,7 @@ function handleScriptElement(scriptEl, transformHelper) { componentVar = builder.identifier('marko_component'); } - transformHelper.setHasBoundWidgetForTemplate(); + transformHelper.setHasBoundComponentForTemplate(); transformHelper.setInlineComponent(componentVar); transformHelper.context.addStaticCode(escodegen.generate(updatedTree)); scriptEl.detach(); @@ -216,7 +216,7 @@ function handleClassDeclaration(classEl, transformHelper) { let object = classToObject(expression); let componentVar = transformHelper.context.addStaticVar('marko_component', escodegen.generate(object)); - transformHelper.setHasBoundWidgetForTemplate(); + transformHelper.setHasBoundComponentForTemplate(); transformHelper.setInlineComponent(componentVar); classEl.detach(); } @@ -234,7 +234,7 @@ module.exports = function handleRootNodes() { var filematch = '('+filename.replace(/\./g, '\\.') + '\\.' + (isEntry ? '|' : '') + ')'; var stylematch = new RegExp('^'+filematch+'style\\.\\w+$'); var componentmatch = new RegExp('^'+filematch+'component\\.\\w+$'); - var widgetmatch = new RegExp('^'+filematch+'widget\\.\\w+$'); + var componentmatch = new RegExp('^'+filematch+'component\\.\\w+$'); var templateRoot = this.el; @@ -244,9 +244,9 @@ module.exports = function handleRootNodes() { fs.readdirSync(dirname).forEach(file => { if(stylematch.test(file)) { context.addDependency('./' + file); - } else if(componentmatch.test(file) || widgetmatch.test(file)) { + } else if(componentmatch.test(file) || componentmatch.test(file)) { hasBindTarget = true; - this.context.data.widgetModule = './'+file.slice(0, file.lastIndexOf('.')); + this.context.data.componentModule = './'+file.slice(0, file.lastIndexOf('.')); } }); @@ -265,7 +265,7 @@ module.exports = function handleRootNodes() { // Don't worry about the TemplateRoot or an Container node } else if (node.type === 'HtmlElement') { if (node.hasAttribute('w-bind')) { - transformHelper.setHasBoundWidgetForTemplate(); + transformHelper.setHasBoundComponentForTemplate(); hasExplicitBind = true; } else { if (node.hasAttribute('id')) { @@ -321,17 +321,17 @@ module.exports = function handleRootNodes() { } if (rootNodes.length > 1 && hasIdCount > 0) { - // We can only bind a widget to multiple top-level elements if we can assign + // We can only bind a component to multiple top-level elements if we can assign // all of the IDs return; } - transformHelper.setHasBoundWidgetForTemplate(); + transformHelper.setHasBoundComponentForTemplate(); var nextKey = 0; rootNodes.forEach((curNode, i) => { - curNode.setAttributeValue('_widgetbind'); + curNode.setAttributeValue('_componentbind'); if (!curNode.hasAttribute('key') && !curNode.hasAttribute('ref')) { if (curNode.type === 'CustomTag' || rootNodes.length > 1) { diff --git a/components/taglib/TransformHelper/index.js b/components/taglib/TransformHelper/index.js index b3faf4cb8..860d976a3 100644 --- a/components/taglib/TransformHelper/index.js +++ b/components/taglib/TransformHelper/index.js @@ -1,7 +1,7 @@ 'use strict'; -var WidgetArgs = require('./WidgetArgs'); +var ComponentArgs = require('./ComponentArgs'); var getRequirePath = require('../getRequirePath'); -var buildWidgetTypeNode = require('../util/buildWidgetTypeNode'); +var buildComponentTypeNode = require('../util/buildComponentTypeNode'); var resolveFrom = require('resolve-from'); var INLINE_COMPONENT_KEY = Symbol('INLINE_COMPONENT'); var MARKO_WIDGETS_VAR_KEY = Symbol('MARKO_WIDGETS_VAR'); @@ -15,82 +15,82 @@ class TransformHelper { this.builder = context.builder; this.dirname = context.dirname; - this.widgetNextElId = 0; - this.widgetArgs = undefined; - this.containingWidgetNode = undefined; - this._markoWidgetsVar = context.data.markoWidgetsVar; + this.componentNextElId = 0; + this.componentArgs = undefined; + this.containingComponentNode = undefined; + this._markoComponentsVar = context.data.markoComponentsVar; this.firstBind = false; } - setHasBoundWidgetForTemplate() { + setHasBoundComponentForTemplate() { this.context.data[HAS_WIDGET_KEY] = true; } - hasBoundWidgetForTemplate() { + hasBoundComponentForTemplate() { return this.context.data[HAS_WIDGET_KEY] || this.context.data[WIDGET_PROPS_KEY] != null; } - getWidgetProps() { - var widgetProps = this.context.data[WIDGET_PROPS_KEY]; - if (!widgetProps) { + getComponentProps() { + var componentProps = this.context.data[WIDGET_PROPS_KEY]; + if (!componentProps) { this.firstBind = true; - widgetProps = this.context.data[WIDGET_PROPS_KEY] = {}; + componentProps = this.context.data[WIDGET_PROPS_KEY] = {}; } - return widgetProps; + return componentProps; } addError(message, code) { this.context.addError(this.el, message, code); } - getWidgetArgs() { - return this.widgetArgs || (this.widgetArgs = new WidgetArgs()); + getComponentArgs() { + return this.componentArgs || (this.componentArgs = new ComponentArgs()); } nextUniqueId() { - var widgetNextElId = this.context.data.widgetNextElId; - if (widgetNextElId == null) { - this.context.data.widgetNextElId = 0; + var componentNextElId = this.context.data.componentNextElId; + if (componentNextElId == null) { + this.context.data.componentNextElId = 0; } - return (this.context.data.widgetNextElId++); + return (this.context.data.componentNextElId++); } getNestedIdExpression() { - this.assignWidgetId(); - return this.getWidgetIdInfo().nestedIdExpression; + this.assignComponentId(); + return this.getComponentIdInfo().nestedIdExpression; } getIdExpression() { - this.assignWidgetId(); - return this.getWidgetIdInfo().idExpression; + this.assignComponentId(); + return this.getComponentIdInfo().idExpression; } - set widgetIdInfo(value) { - this.el.data.widgetIdInfo = value; + set componentIdInfo(value) { + this.el.data.componentIdInfo = value; } - get widgetIdInfo() { - return this.el.data.widgetIdInfo; + get componentIdInfo() { + return this.el.data.componentIdInfo; } - getWidgetIdInfo() { - return this.widgetIdInfo; + getComponentIdInfo() { + return this.componentIdInfo; } getCompileContext() { return this.context; } - getDefaultWidgetModule() { + getDefaultComponentModule() { var dirname = this.dirname; - if (this.context.data.widgetModule) { - return this.context.data.widgetModule; + if (this.context.data.componentModule) { + return this.context.data.componentModule; + } else if (resolveFrom(dirname, './component')) { + return './component'; } else if (resolveFrom(dirname, './component')) { return './component'; - } else if (resolveFrom(dirname, './widget')) { - return './widget'; } else if (resolveFrom(dirname, './')) { return './'; } else { @@ -98,37 +98,37 @@ class TransformHelper { } } - getMarkoWidgetsRequirePath(target) { + getMarkoComponentsRequirePath(target) { return getRequirePath(target, this.context); } - set markoWidgetsVar(value) { + set markoComponentsVar(value) { this.context.data[MARKO_WIDGETS_VAR_KEY] = value; } - get markoWidgetsVar() { + get markoComponentsVar() { if (!this.context.data[MARKO_WIDGETS_VAR_KEY]) { this.context.data[MARKO_WIDGETS_VAR_KEY] = this.context.importModule( - 'marko_widgets', - this.getMarkoWidgetsRequirePath(this.isLegacyWidget ? 'marko/widgets/legacy' : 'marko/widgets')); + 'marko_components', + this.getMarkoComponentsRequirePath(this.isLegacyComponent ? 'marko/components/legacy' : 'marko/components')); } return this.context.data[MARKO_WIDGETS_VAR_KEY]; } - buildWidgetElIdFunctionCall(id) { + buildComponentElIdFunctionCall(id) { var builder = this.builder; - var widgetElId = builder.memberExpression( - builder.identifier('widget'), + var componentElId = builder.memberExpression( + builder.identifier('component'), builder.identifier('elId')); - return builder.functionCall(widgetElId, arguments.length === 0 ? [] : [ id ]); + return builder.functionCall(componentElId, arguments.length === 0 ? [] : [ id ]); } - buildWidgetTypeNode(path, def) { - return buildWidgetTypeNode(path, this.dirname, def, this); + buildComponentTypeNode(path, def) { + return buildComponentTypeNode(path, this.dirname, def, this); } getTransformHelper(el) { @@ -148,13 +148,13 @@ class TransformHelper { } } -TransformHelper.prototype.assignWidgetId = require('./assignWidgetId'); +TransformHelper.prototype.assignComponentId = require('./assignComponentId'); TransformHelper.prototype.handleRootNodes = require('./handleRootNodes'); TransformHelper.prototype.handleIncludeNode = require('./handleIncludeNode'); -TransformHelper.prototype.handleWidgetEvents = require('./handleWidgetEvents'); -TransformHelper.prototype.handleWidgetPreserve = require('./handleWidgetPreserve'); -TransformHelper.prototype.handleWidgetPreserveAttrs = require('./handleWidgetPreserveAttrs'); -TransformHelper.prototype.handleWidgetBind = require('./handleWidgetBind'); -TransformHelper.prototype.handleWidgetFor = require('./handleWidgetFor'); +TransformHelper.prototype.handleComponentEvents = require('./handleComponentEvents'); +TransformHelper.prototype.handleComponentPreserve = require('./handleComponentPreserve'); +TransformHelper.prototype.handleComponentPreserveAttrs = require('./handleComponentPreserveAttrs'); +TransformHelper.prototype.handleComponentBind = require('./handleComponentBind'); +TransformHelper.prototype.handleComponentFor = require('./handleComponentFor'); module.exports = TransformHelper; diff --git a/components/taglib/body-transformer.js b/components/taglib/body-transformer.js index 23b956b39..3598bdd38 100644 --- a/components/taglib/body-transformer.js +++ b/components/taglib/body-transformer.js @@ -6,6 +6,6 @@ module.exports = function transform(el, context) { let awaitReorderer = context.createNodeForEl('await-reorderer'); el.appendChild(awaitReorderer); - let initWidgetsNode = context.createNodeForEl('init-widgets'); - el.appendChild(initWidgetsNode); + let initComponentsNode = context.createNodeForEl('init-components'); + el.appendChild(initComponentsNode); }; \ No newline at end of file diff --git a/components/taglib/component-tag.js b/components/taglib/component-tag.js index 5cd3b0550..3f28f0003 100644 --- a/components/taglib/component-tag.js +++ b/components/taglib/component-tag.js @@ -7,25 +7,25 @@ module.exports = function codeGenerator(el, codegen) { var bodyFunc = builder.renderBodyFunction(el.body, [ builder.identifierOut(), - builder.identifier('widget'), + builder.identifier('component'), builder.identifier('state') ]); - var widgetProps = el.getAttributeValue('props'); + var componentProps = el.getAttributeValue('props'); - var bindWidgetVar = context.addStaticVar('marko_bindWidget', + var bindComponentVar = context.addStaticVar('marko_bindComponent', builder.require( - builder.literal('marko/widgets/taglib/helpers/bindWidget'))); + builder.literal('marko/components/taglib/helpers/bindComponent'))); if (context.data[BIND_WIDGET_KEY] == null) { context.data[BIND_WIDGET_KEY] = 0; } var varName = context.addStaticVar( - 'marko_bindWidget' + (context.data[BIND_WIDGET_KEY]++), - builder.functionCall(bindWidgetVar, [ - widgetProps + 'marko_bindComponent' + (context.data[BIND_WIDGET_KEY]++), + builder.functionCall(bindComponentVar, [ + componentProps ])); return builder.functionCall(varName, [bodyFunc, builder.identifierOut()]); diff --git a/components/taglib/component-types-tag.js b/components/taglib/component-types-tag.js index 7d9a856fe..fc35de408 100644 --- a/components/taglib/component-types-tag.js +++ b/components/taglib/component-types-tag.js @@ -4,7 +4,7 @@ module.exports = function codeGenerator(el, codegen) { var context = codegen.context; var transformHelper = getTransformHelper(el, context); - transformHelper.isLegacyWidget = true; + transformHelper.isLegacyComponent = true; var builder = codegen.builder; @@ -14,14 +14,14 @@ module.exports = function codeGenerator(el, codegen) { attrs.forEach((attr) => { if (!attr.isLiteralString()) { - codegen.addError('Widget type should be a string'); + codegen.addError('Component type should be a string'); return; } - typesObject[attr.name] = transformHelper.buildWidgetTypeNode(attr.literalValue); + typesObject[attr.name] = transformHelper.buildComponentTypeNode(attr.literalValue); }); - codegen.addStaticVar('marko_widgetTypes', builder.literal(typesObject)); + codegen.addStaticVar('marko_componentTypes', builder.literal(typesObject)); return null; }; \ No newline at end of file diff --git a/components/taglib/components-transformer.js b/components/taglib/components-transformer.js index 1e84f66f2..c48fc51f8 100644 --- a/components/taglib/components-transformer.js +++ b/components/taglib/components-transformer.js @@ -19,7 +19,7 @@ module.exports = function transform(el, context) { if (!bodyValue) { bodyValue = builder.memberExpression( - builder.identifier('widget'), + builder.identifier('component'), builder.identifier('b')); includeNode.data.bodySlot = true; @@ -29,11 +29,11 @@ module.exports = function transform(el, context) { el.appendChild(includeNode); } - if (el.tagName === 'widget-types') { - context.setFlag('hasWidgetTypes'); + if (el.tagName === 'component-types') { + context.setFlag('hasComponentTypes'); } else if (el.tagName === 'include') { transformHelper.handleIncludeNode(el); - transformHelper.getWidgetArgs().compile(transformHelper); + transformHelper.getComponentArgs().compile(transformHelper); return; } @@ -42,9 +42,9 @@ module.exports = function transform(el, context) { return; } - if (el.hasAttribute('_widgetbind') || el.hasAttribute('w-bind')) { - el.setFlag('hasWidgetBind'); - transformHelper.handleWidgetBind(); + if (el.hasAttribute('_componentbind') || el.hasAttribute('w-bind')) { + el.setFlag('hasComponentBind'); + transformHelper.handleComponentBind(); } if (/* New preserve attributes */ @@ -57,32 +57,32 @@ module.exports = function transform(el, context) { el.hasAttribute('w-preserve-body') || el.hasAttribute('w-preserve-if') || el.hasAttribute('w-preserve-body-if')) { - transformHelper.handleWidgetPreserve(); + transformHelper.handleComponentPreserve(); } if (el.hasAttribute('key') || el.hasAttribute('ref') || el.hasAttribute('w-id')) { - transformHelper.assignWidgetId(); + transformHelper.assignComponentId(); } if (el.hasAttribute('for-key') || el.hasAttribute('for-ref') || el.hasAttribute('w-for')) { - transformHelper.handleWidgetFor(); + transformHelper.handleComponentFor(); } if (el.hasAttribute('w-body')) { - transformHelper.handleWidgetBody(); + transformHelper.handleComponentBody(); } // Handle w-preserve-attrs and :no-update attributes - transformHelper.handleWidgetPreserveAttrs(); + transformHelper.handleComponentPreserveAttrs(); // Handle w-on* properties - transformHelper.handleWidgetEvents(); + transformHelper.handleComponentEvents(); - // If we need to pass any information to a nested widget then + // If we need to pass any information to a nested component then // we start that information in the "out" so that it can be picked - // up later by the nested widget. We call this "widget args" and - // we generate compiled code that stores the widget args in the out - // for the next widget and then we also insert cleanup code to remove + // up later by the nested component. We call this "component args" and + // we generate compiled code that stores the component args in the out + // for the next component and then we also insert cleanup code to remove // the data out of the out - transformHelper.getWidgetArgs().compile(transformHelper); + transformHelper.getComponentArgs().compile(transformHelper); }; diff --git a/components/taglib/helpers/bindComponent.js b/components/taglib/helpers/bindComponent.js index a58f2e3e7..bb409f3ce 100644 --- a/components/taglib/helpers/bindComponent.js +++ b/components/taglib/helpers/bindComponent.js @@ -1,14 +1,14 @@ var createRendererFunc = require('../../renderer'); -module.exports = function(widgetProps) { +module.exports = function(componentProps) { var renderer = createRendererFunc( - function(data, out, widget, state) { - data.$renderBody(out, widget, state); + function(data, out, component, state) { + data.$renderBody(out, component, state); }, - widgetProps, + componentProps, null); - return function bindWidget(renderBody, out) { + return function bindComponent(renderBody, out) { renderer({ $renderBody: renderBody }, out); diff --git a/components/taglib/helpers/componentArgs.js b/components/taglib/helpers/componentArgs.js index dbcec5c71..93292b49d 100644 --- a/components/taglib/helpers/componentArgs.js +++ b/components/taglib/helpers/componentArgs.js @@ -1,10 +1,10 @@ -var widgetArgsHelper = module.exports = function widgetArgsHelper( +var componentArgsHelper = module.exports = function componentArgsHelper( out, - widgetArgs) { + componentArgs) { - out.data.$w = widgetArgs; + out.data.$w = componentArgs; }; -widgetArgsHelper.cleanup = function(out) { +componentArgsHelper.cleanup = function(out) { delete out.data.$w; }; \ No newline at end of file diff --git a/components/taglib/helpers/getCurrentComponent.js b/components/taglib/helpers/getCurrentComponent.js index 41c5a7df9..17f41a57a 100644 --- a/components/taglib/helpers/getCurrentComponent.js +++ b/components/taglib/helpers/getCurrentComponent.js @@ -1,17 +1,17 @@ /** - * Helper method to return the WidgetDef for the current widget being rendered. - * This is, it returns the widget at the top of the widget stack. - * @param {AsyncWriter} out The current rendering context that holds info about rendered widgets. - * @return {WidgetDef} The WidgetDef instance + * Helper method to return the ComponentDef for the current component being rendered. + * This is, it returns the component at the top of the component stack. + * @param {AsyncWriter} out The current rendering context that holds info about rendered components. + * @return {ComponentDef} The ComponentDef instance */ -module.exports = function getCurrentWidget(out) { - var widgetsContext = out.global.widgets; - var widgetStack; +module.exports = function getCurrentComponent(out) { + var componentsContext = out.global.components; + var componentStack; var len; - if (!widgetsContext || (len = (widgetStack = widgetsContext.$__widgetStack).length) < 2) { - throw Error('No widget found'); + if (!componentsContext || (len = (componentStack = componentsContext.$__componentStack).length) < 2) { + throw Error('No component found'); } - return widgetStack[len - 1]; + return componentStack[len - 1]; }; \ No newline at end of file diff --git a/components/taglib/helpers/package.json b/components/taglib/helpers/package.json index 70de46b70..39393d4f1 100644 --- a/components/taglib/helpers/package.json +++ b/components/taglib/helpers/package.json @@ -1,5 +1,5 @@ { "browser": { - "./getDynamicClientWidgetPath.js": "./getDynamicClientWidgetPath-browser.js" + "./getDynamicClientComponentPath.js": "./getDynamicClientComponentPath-browser.js" } } \ No newline at end of file diff --git a/components/taglib/include-tag.js b/components/taglib/include-tag.js index 78c448cb9..0a151bd27 100644 --- a/components/taglib/include-tag.js +++ b/components/taglib/include-tag.js @@ -1,5 +1,5 @@ var normalInclude = require('../../taglibs/core/include-tag'); -var WidgetsContext = require('../WidgetsContext'); +var ComponentsContext = require('../ComponentsContext'); var getElementById = require('../util').$__getElementById; module.exports = function include(input, out) { @@ -14,8 +14,8 @@ module.exports = function include(input, out) { // the existing body content in the DOM var existingEl = getElementById(out.$__document, elId); if (existingEl) { - var widgetsContext = WidgetsContext.$__getWidgetsContext(out); - widgetsContext.$__preserveDOMNode(elId, true /* body only */); + var componentsContext = ComponentsContext.$__getComponentsContext(out); + componentsContext.$__preserveDOMNode(elId, true /* body only */); } } }; diff --git a/components/taglib/init-components-tag.js b/components/taglib/init-components-tag.js index 01020729c..2b93fa282 100644 --- a/components/taglib/init-components-tag.js +++ b/components/taglib/init-components-tag.js @@ -1,7 +1,7 @@ const INIT_WIDGET_KEY = Symbol(); -var writeInitWidgetsCode = require('../').writeInitWidgetsCode; -var WidgetsContext = require('../WidgetsContext'); +var writeInitComponentsCode = require('../').writeInitComponentsCode; +var ComponentsContext = require('../ComponentsContext'); module.exports = function render(input, out) { var global = out.global; @@ -11,27 +11,27 @@ module.exports = function render(input, out) { out.on('await:beforeRender', function(eventArgs) { if (eventArgs.clientReorder) { var asyncFragmentOut = eventArgs.out; - asyncFragmentOut.data.widgets = new WidgetsContext(asyncFragmentOut); + asyncFragmentOut.data.components = new ComponentsContext(asyncFragmentOut); } }); out.on('await:finish', function(eventArgs) { var asyncFragmentOut = eventArgs.out; - var widgetsContext = asyncFragmentOut.data.widgets || asyncFragmentOut.global.widgets; - if (widgetsContext) { - writeInitWidgetsCode(widgetsContext, asyncFragmentOut); + var componentsContext = asyncFragmentOut.data.components || asyncFragmentOut.global.components; + if (componentsContext) { + writeInitComponentsCode(componentsContext, asyncFragmentOut); } }); if (out.isSync()) { - var widgetsContext = WidgetsContext.$__getWidgetsContext(out); - writeInitWidgetsCode(widgetsContext, out); + var componentsContext = ComponentsContext.$__getComponentsContext(out); + writeInitComponentsCode(componentsContext, out); } else { var asyncOut = out.beginAsync({ last: true, timeout: -1 }); out.onLast(function(next) { - var widgetsContext = WidgetsContext.$__getWidgetsContext(out); - writeInitWidgetsCode(widgetsContext, asyncOut); + var componentsContext = ComponentsContext.$__getComponentsContext(out); + writeInitComponentsCode(componentsContext, asyncOut); asyncOut.end(); next(); }); diff --git a/components/taglib/marko.json b/components/taglib/marko.json index b90b73866..c3184554c 100644 --- a/components/taglib/marko.json +++ b/components/taglib/marko.json @@ -32,10 +32,10 @@ { "displayText": "key=\"\"", "snippet": "key=\"${1:method}\"", - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/get-started/#referencing-nested-widgets" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components" }, { - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/get-started/#referencing-nested-widgets" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#referencing-nested-components" } ] }, @@ -68,12 +68,12 @@ "type": "statement", "allow-expressions": true, "preserve-name": true, - "set-flag": "hasWidgetEvents", + "set-flag": "hasComponentEvents", "autocomplete": [ { "displayText": "on(\"\")", "snippet": "on${1:Click}(\"handle${2:Button}${1:Click}\")", - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/get-started/#adding-dom-event-listeners" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/get-started/#adding-dom-event-listeners" } ] }, @@ -82,7 +82,7 @@ "type": "string", "allow-expressions": true, "preserve-name": true, - "set-flag": "hasWidgetEvents", + "set-flag": "hasComponentEvents", "autocomplete": [], "deprecated": true }, @@ -117,7 +117,7 @@ "preserve-name": true, "autocomplete": [ { - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/#preserving-dom-nodes-during-re-render" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render" } ] }, @@ -126,7 +126,7 @@ "preserve-name": true, "autocomplete": [ { - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/#preserving-dom-nodes-during-re-render" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render" } ] }, @@ -135,7 +135,7 @@ "autocomplete": [ { "snippet": "no-update-if(${1:condition})", - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/#preserving-dom-nodes-during-re-render" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render" } ] }, @@ -144,7 +144,7 @@ "autocomplete": [ { "snippet": "no-update-body-if(${1:condition})", - "descriptionMoreURL": "http://markojs.com/docs/marko-widgets/#preserving-dom-nodes-during-re-render" + "descriptionMoreURL": "http://markojs.com/docs/marko-components/#preserving-dom-nodes-during-re-render" } ] }, @@ -154,14 +154,14 @@ "autocomplete": [], "deprecated": true }, - "transformer": "./widgets-transformer.js" + "transformer": "./components-transformer.js" }, - "<_widget>": { - "code-generator": "./widget-tag.js", + "<_component>": { + "code-generator": "./component-tag.js", "autocomplete": [] }, - "": { - "renderer": "./init-widgets-tag.js", + "": { + "renderer": "./init-components-tag.js", "@immediate": "boolean" }, "": { @@ -179,8 +179,8 @@ "@body-only": "expression", "autocomplete": [] }, - "": { - "code-generator": "./widget-types-tag.js", + "": { + "code-generator": "./component-types-tag.js", "@*": "string", "autocomplete": [], "deprecated": true @@ -188,5 +188,5 @@ "": { "transformer": "./body-transformer.js" }, - "transformer": "./widgets-transformer.js" + "transformer": "./components-transformer.js" } diff --git a/components/taglib/preserve-tag.js b/components/taglib/preserve-tag.js index fef625a41..36799db44 100644 --- a/components/taglib/preserve-tag.js +++ b/components/taglib/preserve-tag.js @@ -1,4 +1,4 @@ -var WidgetsContext = require('../WidgetsContext'); +var ComponentsContext = require('../ComponentsContext'); var getElementById = require('../util').$__getElementById; module.exports = function render(input, out) { @@ -16,7 +16,7 @@ module.exports = function render(input, out) { if (condition !== false) { var existingEl = getElementById(out.$__document, id); if (existingEl) { - var widgetsContext = WidgetsContext.$__getWidgetsContext(out); + var componentsContext = ComponentsContext.$__getComponentsContext(out); var bodyOnly = input.bodyOnly === true; // Don't actually render anything since the element is already in the DOM, // but keep track that the node is being preserved so that we can ignore @@ -31,7 +31,7 @@ module.exports = function render(input, out) { out.element(tagName, { id: id }); } - widgetsContext.$__preserveDOMNode(id, bodyOnly); + componentsContext.$__preserveDOMNode(id, bodyOnly); return; } } diff --git a/components/taglib/util/buildComponentTypeNode.js b/components/taglib/util/buildComponentTypeNode.js index 07c9b51ef..23e2c0b5f 100644 --- a/components/taglib/util/buildComponentTypeNode.js +++ b/components/taglib/util/buildComponentTypeNode.js @@ -4,7 +4,7 @@ var resolveFrom = tryRequire('resolve-from', require); var nodePath = require('path'); var ok = require('assert').ok; -module.exports = function buildWidgetTypeNode(path, from, def, transformHelper) { +module.exports = function buildComponentTypeNode(path, from, def, transformHelper) { ok(typeof path === 'string', '"path" should be a string'); ok(typeof from === 'string', '"from" should be a string'); @@ -12,15 +12,15 @@ module.exports = function buildWidgetTypeNode(path, from, def, transformHelper) var builder = context.builder; - var registerWidget = context.addStaticVar('marko_registerWidget', - builder.memberExpression(transformHelper.markoWidgetsVar, builder.identifier('rw'))); + var registerComponent = context.addStaticVar('marko_registerComponent', + builder.memberExpression(transformHelper.markoComponentsVar, builder.identifier('rw'))); var typeName; if (lassoModulesClientTransport) { var targetPath = resolveFrom(from, path); if (!targetPath) { - throw new Error('Widget module not found: ' + path + ' (from ' + from + ')'); + throw new Error('Component module not found: ' + path + ' (from ' + from + ')'); } typeName = lassoModulesClientTransport.getClientPath(targetPath); } else { @@ -30,11 +30,11 @@ module.exports = function buildWidgetTypeNode(path, from, def, transformHelper) if (!def) { var returnValue = builder.require(builder.literal(path)); - if (transformHelper.isLegacyWidget) { - var defineWidget = context.addStaticVar('marko_defineWidget', - builder.memberExpression(transformHelper.markoWidgetsVar, builder.identifier('w'))); + if (transformHelper.isLegacyComponent) { + var defineComponent = context.addStaticVar('marko_defineComponent', + builder.memberExpression(transformHelper.markoComponentsVar, builder.identifier('w'))); - returnValue = builder.functionCall(defineWidget, [returnValue]); + returnValue = builder.functionCall(defineComponent, [returnValue]); } def = builder.functionDeclaration(null, [] /* params */, [ @@ -42,7 +42,7 @@ module.exports = function buildWidgetTypeNode(path, from, def, transformHelper) ]); } - return builder.functionCall(registerWidget, [ + return builder.functionCall(registerComponent, [ builder.literal(typeName), def ]); diff --git a/components/update-manager.js b/components/update-manager.js index 56bff497b..4aa54f7d0 100644 --- a/components/update-manager.js +++ b/components/update-manager.js @@ -33,12 +33,12 @@ if (!setImmediate) { /** * This function is called when we schedule the update of "unbatched" - * updates to widgets. + * updates to components. */ -function updateUnbatchedWidgets() { +function updateUnbatchedComponents() { if (unbatchedQueue.length) { try { - updateWidgets(unbatchedQueue); + updateComponents(unbatchedQueue); } finally { // Reset the flag now that this scheduled batch update // is complete so that we can later schedule another @@ -57,16 +57,16 @@ function scheduleUpdates() { updatesScheduled = true; - setImmediate(updateUnbatchedWidgets); + setImmediate(updateUnbatchedComponents); } -function updateWidgets(queue) { - // Loop over the widgets in the queue and update them. +function updateComponents(queue) { + // Loop over the components in the queue and update them. // NOTE: It is okay if the queue grows during the iteration // since we will still get to them at the end for (var i=0; i onUpdate * render --> onRender */ -function emitLifecycleEvent(widget, eventType, eventArg1, eventArg2) { - var listenerMethod = widget[lifecycleEventMethods[eventType]]; +function emitLifecycleEvent(component, eventType, eventArg1, eventArg2) { + var listenerMethod = component[lifecycleEventMethods[eventType]]; if (listenerMethod) { - listenerMethod.call(widget, eventArg1, eventArg2); + listenerMethod.call(component, eventArg1, eventArg2); } - widget.emit(eventType, eventArg1, eventArg2); + component.emit(eventType, eventArg1, eventArg2); } -function destroyWidgetForEl(el) { - var widgetToDestroy = el._w; - if (widgetToDestroy) { - widgetToDestroy.$__destroyShallow(); +function destroyComponentForEl(el) { + var componentToDestroy = el._w; + if (componentToDestroy) { + componentToDestroy.$__destroyShallow(); el._w = null; - while ((widgetToDestroy = widgetToDestroy.$__rootFor)) { - widgetToDestroy.$__rootFor = null; - widgetToDestroy.$__destroyShallow(); + while ((componentToDestroy = componentToDestroy.$__rootFor)) { + componentToDestroy.$__rootFor = null; + componentToDestroy.$__destroyShallow(); } } } @@ -74,7 +74,7 @@ function destroyElRecursive(el) { var curChild = el.firstChild; while(curChild) { if (curChild.nodeType == 1) { - destroyWidgetForEl(curChild); + destroyComponentForEl(curChild); destroyElRecursive(curChild); } curChild = curChild.nextSibling; @@ -83,7 +83,7 @@ function destroyElRecursive(el) { var nextUniqueId = 0; -function nextWidgetId() { +function nextComponentId() { return 'wc' + (nextUniqueId++); } @@ -91,19 +91,19 @@ function getElementById(doc, id) { return doc.getElementById(id); } -function attachBubblingEvent(widgetDef, handlerMethodName, extraArgs) { +function attachBubblingEvent(componentDef, handlerMethodName, extraArgs) { if (handlerMethodName) { return extraArgs ? - [handlerMethodName, widgetDef.id, extraArgs] : - [handlerMethodName, widgetDef.id]; + [handlerMethodName, componentDef.id, extraArgs] : + [handlerMethodName, componentDef.id]; } } -exports.$__widgetLookup = widgetLookup; -exports.$__getWidgetForEl = getWidgetForEl; +exports.$__componentLookup = componentLookup; +exports.$__getComponentForEl = getComponentForEl; exports.$__emitLifecycleEvent = emitLifecycleEvent; -exports.$__destroyWidgetForEl = destroyWidgetForEl; +exports.$__destroyComponentForEl = destroyComponentForEl; exports.$__destroyElRecursive = destroyElRecursive; -exports.$__nextWidgetId = nextWidgetId; +exports.$__nextComponentId = nextComponentId; exports.$__getElementById = getElementById; exports.$__attachBubblingEvent = attachBubblingEvent; \ No newline at end of file diff --git a/components/util.js b/components/util.js index c8c50ad25..c97d14233 100644 --- a/components/util.js +++ b/components/util.js @@ -2,11 +2,11 @@ var KEY = Symbol(); var isArray = Array.isArray; function UniqueId(out) { - this.prefix = out.global.widgetIdPrefix || 'w'; + this.prefix = out.global.componentIdPrefix || 'w'; this.nextId = 0; } -function nextWidgetId(out) { +function nextComponentId(out) { var global = out.global; var idProvider = global[KEY] || @@ -15,11 +15,11 @@ function nextWidgetId(out) { return idProvider.prefix + (idProvider.nextId++); } -function attachBubblingEvent(widgetDef, handlerMethodName, extraArgs) { +function attachBubblingEvent(componentDef, handlerMethodName, extraArgs) { if (handlerMethodName) { if (extraArgs) { - var bubblingDomEvents = widgetDef.$__bubblingDomEvents || - ( widgetDef.$__bubblingDomEvents = [] ); + var bubblingDomEvents = componentDef.$__bubblingDomEvents || + ( componentDef.$__bubblingDomEvents = [] ); var eventIndex = bubblingDomEvents.length; if (extraArgs.length === 1) { @@ -33,13 +33,13 @@ function attachBubblingEvent(widgetDef, handlerMethodName, extraArgs) { bubblingDomEvents.push(extraArgs); } - return handlerMethodName + ' ' + widgetDef.id + ' ' + eventIndex; + return handlerMethodName + ' ' + componentDef.id + ' ' + eventIndex; } else { - return handlerMethodName + ' ' + widgetDef.id; + return handlerMethodName + ' ' + componentDef.id; } } } -exports.$__nextWidgetId = nextWidgetId; +exports.$__nextComponentId = nextComponentId; exports.$__server = true; exports.$__attachBubblingEvent = attachBubblingEvent; \ No newline at end of file diff --git a/defineRenderer.js b/defineRenderer.js index 097ee8c24..65d13224e 100644 --- a/defineRenderer.js +++ b/defineRenderer.js @@ -20,7 +20,7 @@ function defineRenderer(def) { if (!renderer) { // Create a renderer function that takes care of translating // the input properties to a view state. Also, this renderer - // takes care of re-using existing widgets. + // takes care of re-using existing components. renderer = function renderer(input, out) { var newProps = input; diff --git a/docs/06-components.md b/docs/06-components.md index e86db9231..2074f4dde 100644 --- a/docs/06-components.md +++ b/docs/06-components.md @@ -163,9 +163,9 @@ module.exports = { > **Note**: When using a plain object, use the `onCreate` [lifecycle method]() instead of `contructor`. -### Split renderer & widget +### Split renderer & component With this alternative technique to define a component, you don't have access to stateful re-rendering, but the template rendering logic will not be sent down to the browser. -Marko automatically discovers widget files in the same directory as a template. For example if you have a template named `button.marko`, it will automatically look for `button.widget.js`. If your template is named `index.marko`, it will look for `widget.js` in addition to `index.widget.js`. +Marko automatically discovers component files in the same directory as a template. For example if you have a template named `button.marko`, it will automatically look for `button.component.js`. If your template is named `index.marko`, it will look for `component.js` in addition to `index.component.js`. diff --git a/hot-reload/index.js b/hot-reload/index.js index 0d1885822..158319e99 100644 --- a/hot-reload/index.js +++ b/hot-reload/index.js @@ -7,7 +7,7 @@ const nodeRequire = require('../node-require'); var compiler; var marko; var runtime; -var widgets; +var components; var modifiedId = 1; var HOT_RELOAD_KEY = Symbol('HOT_RELOAD'); @@ -188,4 +188,4 @@ exports.handleFileModified = function(path, options) { compiler = require('../compiler'); marko = require('../'); runtime = require('../runtime/html'); -widgets = require('../widgets'); \ No newline at end of file +components = require('../components'); \ No newline at end of file diff --git a/jquery.js b/jquery.js index 21bbcf067..c4bffaf07 100644 --- a/jquery.js +++ b/jquery.js @@ -2,7 +2,7 @@ var ready = require('./ready'); var idRegExp = /^\#(\S+)( .*)?/; -exports.patchWidget = function(jQuery) { +exports.patchComponent = function(jQuery) { /* globals window */ if (!jQuery) { @@ -12,7 +12,7 @@ exports.patchWidget = function(jQuery) { } } - require('./widgets/Widget').prototype.$ = function jqueryProxy(arg) { + require('./components/Component').prototype.$ = function jqueryProxy(arg) { var args = arguments; var self = this; @@ -26,16 +26,16 @@ exports.patchWidget = function(jQuery) { var match = idRegExp.exec(arg); //Reset the search to 0 so the next call to exec will start from the beginning for the new string if (match != null) { - var widgetElId = match[1]; + var componentElId = match[1]; if (match[2] == null) { - return jQuery(self.getEl(widgetElId)); + return jQuery(self.getEl(componentElId)); } else { - return jQuery('#' + self.getElId(widgetElId) + match[2]); + return jQuery('#' + self.getElId(componentElId) + match[2]); } } else { var rootEl = self.getEl(); if (!rootEl) { - throw new Error('Root element is not defined for widget'); + throw new Error('Root element is not defined for component'); } if (rootEl) { return jQuery(arg, rootEl); diff --git a/package.json b/package.json index e9ff4de71..0a58f3018 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "template", "async", "streaming", - "widgets", + "components", "components", "ui", "vdom", @@ -20,7 +20,7 @@ "url": "https://github.com/marko-js/marko.git" }, "scripts": { - "test": "npm run jshint -s && npm run mocha -s && npm run test-widgets -s && npm run test-widgets-deprecated -s", + "test": "npm run jshint -s && npm run mocha -s && npm run test-components -s && npm run test-components-deprecated -s", "mocha": "mocha --ui bdd --reporter spec ./test/", "test-coverage": "npm run test-generate-coverage && nyc report --reporter=html && open ./coverage/index.html", "test-generate-coverage": "nyc -asc npm run test", @@ -28,16 +28,16 @@ "test-async": "mocha --ui bdd --reporter spec ./test/async-render-test", "test-taglib-loader": "mocha --ui bdd --reporter spec ./test/taglib-loader-test", "test-express": "mocha --ui bdd --reporter spec ./test/express-test", - "test-widgets": "npm run test-widgets-browser -s && npm run test-widgets-pages -s", - "test-widgets-deprecated": "npm run test-widgets-browser-deprecated -s && npm run test-widgets-pages-deprecated -s", - "test-widgets-browser": "node test/browser-tests-runner/cli.js test/widgets-browser-tests.js --automated", - "test-widgets-browser-deprecated": "node test/browser-tests-runner/cli.js test/deprecated-widgets-browser-tests.js --automated && npm run test-widgets-pages-deprecated -s", - "test-widgets-pages": "node test/browser-tests-runner/cli.js --pages --automated", - "test-widgets-pages-deprecated": "node test/browser-tests-runner/cli.js --pagesDeprecated --automated", - "test-widgets-browser-dev": "browser-refresh test/browser-tests-runner/cli.js test/widgets-browser-tests.js --server", - "test-page": "node test/browser-tests-runner/cli.js test/widgets-browser-tests.js --automated --page", - "test-pages": "npm run test-widgets-pages", - "jshint": "jshint compiler/ runtime/ taglibs/ widgets/", + "test-components": "npm run test-components-browser -s && npm run test-components-pages -s", + "test-components-deprecated": "npm run test-components-browser-deprecated -s && npm run test-components-pages-deprecated -s", + "test-components-browser": "node test/browser-tests-runner/cli.js test/components-browser-tests.js --automated", + "test-components-browser-deprecated": "node test/browser-tests-runner/cli.js test/deprecated-components-browser-tests.js --automated && npm run test-components-pages-deprecated -s", + "test-components-pages": "node test/browser-tests-runner/cli.js --pages --automated", + "test-components-pages-deprecated": "node test/browser-tests-runner/cli.js --pagesDeprecated --automated", + "test-components-browser-dev": "browser-refresh test/browser-tests-runner/cli.js test/components-browser-tests.js --server", + "test-page": "node test/browser-tests-runner/cli.js test/components-browser-tests.js --automated --page", + "test-pages": "npm run test-components-pages", + "jshint": "jshint compiler/ runtime/ taglibs/ components/", "coveralls": "nyc report --reporter=text-lcov | coveralls" }, "author": "Patrick Steele-Idem ", diff --git a/ready.js b/ready.js index 25ad55b0c..751ffadab 100644 --- a/ready.js +++ b/ready.js @@ -134,8 +134,8 @@ function ready(callback, thisObj, doc) { module.exports = ready; -module.exports.patchWidget = function() { - require('./widgets/Widget').prototype.ready = function (callback) { +module.exports.patchComponent = function() { + require('./components/Component').prototype.ready = function (callback) { var document = this.el.ownerDocument; ready(callback, this, document); }; diff --git a/runtime/RenderResult.js b/runtime/RenderResult.js index e1856931a..24c1f64af 100644 --- a/runtime/RenderResult.js +++ b/runtime/RenderResult.js @@ -1,63 +1,63 @@ var domInsert = require('./dom-insert'); function checkAddedToDOM(result, method) { - if (!result.$__widgets) { + if (!result.$__components) { throw Error('Not added to DOM'); } } -function getWidgetDefs(result) { - var widgetDefs = result.$__widgets; +function getComponentDefs(result) { + var componentDefs = result.$__components; - if (widgetDefs.length === 0) { - throw Error('No widget'); + if (componentDefs.length === 0) { + throw Error('No component'); } - return widgetDefs; + return componentDefs; } function RenderResult(out) { this.out = this.$__out = out; - this.$__widgets = null; + this.$__components = null; } module.exports = RenderResult; var proto = RenderResult.prototype = { - getWidget: function() { - checkAddedToDOM(this, 'getWidget'); + getComponent: function() { + checkAddedToDOM(this, 'getComponent'); - var rerenderWidgetInfo = this.$__out.global.$w; - var rerenderWidget = rerenderWidgetInfo && rerenderWidgetInfo[0]; - if (rerenderWidget) { - return rerenderWidget; + var rerenderComponentInfo = this.$__out.global.$w; + var rerenderComponent = rerenderComponentInfo && rerenderComponentInfo[0]; + if (rerenderComponent) { + return rerenderComponent; } - return getWidgetDefs(this)[0].$__widget; + return getComponentDefs(this)[0].$__component; }, - getWidgets: function(selector) { - checkAddedToDOM(this, 'getWidgets'); + getComponents: function(selector) { + checkAddedToDOM(this, 'getComponents'); - var widgetDefs = getWidgetDefs(this); + var componentDefs = getComponentDefs(this); - var widgets = []; + var components = []; var i; - for (i = 0; i < widgetDefs.length; i++) { - var widget = widgetDefs[i].$__widget; - if (!selector || selector(widget)) { - widgets.push(widget); + for (i = 0; i < componentDefs.length; i++) { + var component = componentDefs[i].$__component; + if (!selector || selector(component)) { + components.push(component); } } - return widgets; + return components; }, afterInsert: function(doc) { var out = this.$__out; - var widgetsContext = out.global.widgets; - if (widgetsContext) { - this.$__widgets = widgetsContext.$__widgets; - widgetsContext.$__initWidgets(doc); + var componentsContext = out.global.components; + if (componentsContext) { + this.$__components = componentsContext.$__components; + componentsContext.$__initComponents(doc); } return this; @@ -77,7 +77,7 @@ var proto = RenderResult.prototype = { document: typeof document !== 'undefined' && document }; -// Add all of the following DOM methods to Widget.prototype: +// Add all of the following DOM methods to Component.prototype: // - appendTo(referenceEl) // - replace(referenceEl) // - replaceChildrenOf(referenceEl) diff --git a/runtime/dom-insert.js b/runtime/dom-insert.js index 68db86a13..549e69d9e 100644 --- a/runtime/dom-insert.js +++ b/runtime/dom-insert.js @@ -1,7 +1,7 @@ var extend = require('raptor-util/extend'); -var widgetsUtil = require('../widgets/util'); -var destroyWidgetForEl = widgetsUtil.$__destroyWidgetForEl; -var destroyElRecursive = widgetsUtil.$__destroyElRecursive; +var componentsUtil = require('../components/util'); +var destroyComponentForEl = componentsUtil.$__destroyComponentForEl; +var destroyElRecursive = componentsUtil.$__destroyElRecursive; function resolveEl(el) { if (typeof el === 'string') { @@ -16,7 +16,7 @@ function resolveEl(el) { function beforeRemove(referenceEl) { destroyElRecursive(referenceEl); - destroyWidgetForEl(referenceEl); + destroyComponentForEl(referenceEl); } module.exports = function(target, getEl, afterInsert) { diff --git a/test/autotests/components-browser-deprecated/widget-getInitialProps/test.js b/test/autotests/components-browser-deprecated/widget-getInitialProps/test.js index feeb058c0..f7bf3fedf 100644 --- a/test/autotests/components-browser-deprecated/widget-getInitialProps/test.js +++ b/test/autotests/components-browser-deprecated/widget-getInitialProps/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.el.innerHTML).to.contain('Hello FRANK!'); + expect(component.el.innerHTML).to.contain('Hello FRANK!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/template.marko b/test/autotests/components-browser-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/template.marko index 6ef5f00a8..4a1268cae 100644 --- a/test/autotests/components-browser-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/template.marko +++ b/test/autotests/components-browser-deprecated/widget-invoke-widget-id-dynamic/components/app-bar/template.marko @@ -1,3 +1,3 @@ -
+
${data.label}
\ No newline at end of file diff --git a/test/autotests/components-browser-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js b/test/autotests/components-browser-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js index fdc9c3113..c8f9c00a3 100644 --- a/test/autotests/components-browser-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js +++ b/test/autotests/components-browser-deprecated/widget-stateful-preserve-body/components/app-stateful-button/index.js @@ -1,4 +1,4 @@ -module.exports = require('marko/widgets/legacy').defineComponent({ +module.exports = require('marko/components/legacy').defineComponent({ template: require.resolve('./template.marko'), getInitialState: function(input) { return { @@ -52,7 +52,7 @@ module.exports = require('marko/widgets/legacy').defineComponent({ }, handleClick: function(event) { - // Every Widget instance is also an EventEmitter instance. + // Every Component instance is also an EventEmitter instance. // We will emit a custom "click" event when a DOM click event // is triggered this.emit('click', { diff --git a/test/autotests/components-browser/class-named/test.js b/test/autotests/components-browser/class-named/test.js index ece1c4b3f..98846dd24 100644 --- a/test/autotests/components-browser/class-named/test.js +++ b/test/autotests/components-browser/class-named/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { }); + var component = helpers.mount(require('./index'), { }); - expect(widget.sayHello('Frank')).to.equal('Hello Frank!'); + expect(component.sayHello('Frank')).to.equal('Hello Frank!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/custom-events-repeated-component/test.js b/test/autotests/components-browser/custom-events-repeated-component/test.js index 07c16dbaa..8b06283b7 100644 --- a/test/autotests/components-browser/custom-events-repeated-component/test.js +++ b/test/autotests/components-browser/custom-events-repeated-component/test.js @@ -17,7 +17,7 @@ var items = [ ]; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { items: items }); @@ -26,7 +26,7 @@ module.exports = function(helpers) { expect(lookup.componentsById[0].id).to.not.equal(lookup.componentsById[1].id); lookup.componentsById[0].emitPurchase(); - expect(widget.purchaseEvents).to.deep.equal([ + expect(component.purchaseEvents).to.deep.equal([ { id: 0, title: 'Item 1' @@ -34,7 +34,7 @@ module.exports = function(helpers) { ]); lookup.componentsById[1].emitPurchase(); - expect(widget.purchaseEvents).to.deep.equal([ + expect(component.purchaseEvents).to.deep.equal([ { id: 0, title: 'Item 1' diff --git a/test/autotests/components-browser/custom-events/index.marko b/test/autotests/components-browser/custom-events/index.marko index 864a20e34..6eb859b42 100644 --- a/test/autotests/components-browser/custom-events/index.marko +++ b/test/autotests/components-browser/custom-events/index.marko @@ -6,7 +6,7 @@ - +
  • ${color}
    • diff --git a/test/autotests/components-browser/custom-events/test.js b/test/autotests/components-browser/custom-events/test.js index ad4940a2a..853daaa89 100644 --- a/test/autotests/components-browser/custom-events/test.js +++ b/test/autotests/components-browser/custom-events/test.js @@ -1,17 +1,17 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); var testEventFired = false; - widget.getWidget('bar').on('testEvent', function(a, b) { + component.getComponent('bar').on('testEvent', function(a, b) { expect(a).to.equal('a'); expect(b).to.equal('b'); testEventFired = true; }); - widget.getWidget('bar').emitTestEvent(); + component.getComponent('bar').emitTestEvent(); expect(testEventFired).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/custom-events/widget.js b/test/autotests/components-browser/custom-events/widget.js index 1996535e3..66a687f2b 100644 --- a/test/autotests/components-browser/custom-events/widget.js +++ b/test/autotests/components-browser/custom-events/widget.js @@ -1,6 +1,6 @@ module.exports = { onMount: function() { this.name = 'app-foo'; - this.getWidget('bar').appendHtml('FOO'); + this.getComponent('bar').appendHtml('FOO'); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/destroy-multiple-root-els/test.js b/test/autotests/components-browser/destroy-multiple-root-els/test.js index fcd736947..b7c1814f9 100644 --- a/test/autotests/components-browser/destroy-multiple-root-els/test.js +++ b/test/autotests/components-browser/destroy-multiple-root-els/test.js @@ -2,18 +2,18 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); + var component = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); - var nameEl = widget.getEl('name'); - var ageEl = widget.getEl('age'); - var linkEl = widget.els[2]; + var nameEl = component.getEl('name'); + var ageEl = component.getEl('age'); + var linkEl = component.els[2]; expect(nameEl.parentNode != null).to.equal(true); expect(ageEl.parentNode != null).to.equal(true); expect(linkEl.parentNode != null).to.equal(true); - widget.destroy(); + component.destroy(); expect(nameEl.parentNode == null).to.equal(true); expect(ageEl.parentNode == null).to.equal(true); diff --git a/test/autotests/components-browser/destroy-widget/test.js b/test/autotests/components-browser/destroy-widget/test.js index 93fa119bf..c4ae476db 100644 --- a/test/autotests/components-browser/destroy-widget/test.js +++ b/test/autotests/components-browser/destroy-widget/test.js @@ -1,11 +1,11 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { showSimple: true }); - var simple = widget.getWidget('simple'); + var simple = component.getComponent('simple'); var simpleDestroyed = false; simple.onDestroy = function() { @@ -14,14 +14,14 @@ module.exports = function(helpers) { expect(simple != null).to.equal(true); - widget.input = { + component.input = { showSimple: false }; - widget.update(); + component.update(); expect(simpleDestroyed).to.equal(true); expect(simple.isDestroyed()).to.equal(true); - expect(widget.getWidget('simple') == null).to.equal(true); + expect(component.getComponent('simple') == null).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/dom-events-repeated-el-bubbling-one-arg/test.js b/test/autotests/components-browser/dom-events-repeated-el-bubbling-one-arg/test.js index e6bee395f..fd4f211a6 100644 --- a/test/autotests/components-browser/dom-events-repeated-el-bubbling-one-arg/test.js +++ b/test/autotests/components-browser/dom-events-repeated-el-bubbling-one-arg/test.js @@ -1,18 +1,18 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: [ 'red', 'green', 'blue' ] }); - var liEls = widget.el.querySelectorAll('li'); + var liEls = component.el.querySelectorAll('li'); helpers.triggerMouseEvent(liEls[0], 'click'); - expect(widget.color).to.equal('red'); + expect(component.color).to.equal('red'); helpers.triggerMouseEvent(liEls[1], 'click'); - expect(widget.color).to.equal('green'); + expect(component.color).to.equal('green'); helpers.triggerMouseEvent(liEls[2], 'click'); - expect(widget.color).to.equal('blue'); + expect(component.color).to.equal('blue'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/dom-events-repeated-el-bubbling-two-args/test.js b/test/autotests/components-browser/dom-events-repeated-el-bubbling-two-args/test.js index 86f289a52..521b0adf0 100644 --- a/test/autotests/components-browser/dom-events-repeated-el-bubbling-two-args/test.js +++ b/test/autotests/components-browser/dom-events-repeated-el-bubbling-two-args/test.js @@ -1,29 +1,29 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: [ 'red', 'green', 'blue' ] }); - var liEls = widget.el.querySelectorAll('ul.primary li'); + var liEls = component.el.querySelectorAll('ul.primary li'); helpers.triggerMouseEvent(liEls[0], 'click'); - expect(widget.color).to.deep.equal({color: 'red', type: 'primary'}); + expect(component.color).to.deep.equal({color: 'red', type: 'primary'}); helpers.triggerMouseEvent(liEls[1], 'click'); - expect(widget.color).to.deep.equal({color: 'green', type: 'primary'}); + expect(component.color).to.deep.equal({color: 'green', type: 'primary'}); helpers.triggerMouseEvent(liEls[2], 'click'); - expect(widget.color).to.deep.equal({color: 'blue', type: 'primary'}); + expect(component.color).to.deep.equal({color: 'blue', type: 'primary'}); - liEls = widget.el.querySelectorAll('ul.secondary li'); + liEls = component.el.querySelectorAll('ul.secondary li'); helpers.triggerMouseEvent(liEls[0], 'click'); - expect(widget.color).to.deep.equal({color: 'red', type: 'secondary'}); + expect(component.color).to.deep.equal({color: 'red', type: 'secondary'}); helpers.triggerMouseEvent(liEls[1], 'click'); - expect(widget.color).to.deep.equal({color: 'green', type: 'secondary'}); + expect(component.color).to.deep.equal({color: 'green', type: 'secondary'}); helpers.triggerMouseEvent(liEls[2], 'click'); - expect(widget.color).to.deep.equal({color: 'blue', type: 'secondary'}); + expect(component.color).to.deep.equal({color: 'blue', type: 'secondary'}); }; \ No newline at end of file diff --git a/test/autotests/components-browser/dom-events-repeated-el-bubbling/test.js b/test/autotests/components-browser/dom-events-repeated-el-bubbling/test.js index 78c17864d..d689d8201 100644 --- a/test/autotests/components-browser/dom-events-repeated-el-bubbling/test.js +++ b/test/autotests/components-browser/dom-events-repeated-el-bubbling/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.clicked).to.equal(false); - helpers.triggerMouseEvent(widget.getEl('button'), 'click'); - expect(widget.clicked).to.equal(true); + expect(component.clicked).to.equal(false); + helpers.triggerMouseEvent(component.getEl('button'), 'click'); + expect(component.clicked).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/dom-events-repeated-el-non-bubbling-multiple/test.js b/test/autotests/components-browser/dom-events-repeated-el-non-bubbling-multiple/test.js index a5d6f0b92..2ad579822 100644 --- a/test/autotests/components-browser/dom-events-repeated-el-non-bubbling-multiple/test.js +++ b/test/autotests/components-browser/dom-events-repeated-el-non-bubbling-multiple/test.js @@ -1,27 +1,27 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: [ 'red', 'green', 'blue' ] }); - var liEls = widget.el.querySelectorAll('li'); + var liEls = component.el.querySelectorAll('li'); helpers.triggerMouseEvent(liEls[0], 'mouseover'); - expect(widget.mouseOverColor).to.equal('red'); + expect(component.mouseOverColor).to.equal('red'); helpers.triggerMouseEvent(liEls[1], 'mouseover'); - expect(widget.mouseOverColor).to.equal('green'); + expect(component.mouseOverColor).to.equal('green'); helpers.triggerMouseEvent(liEls[2], 'mouseover'); - expect(widget.mouseOverColor).to.equal('blue'); + expect(component.mouseOverColor).to.equal('blue'); helpers.triggerMouseEvent(liEls[0], 'mouseout'); - expect(widget.mouseOutColor).to.equal('red'); + expect(component.mouseOutColor).to.equal('red'); helpers.triggerMouseEvent(liEls[1], 'mouseout'); - expect(widget.mouseOutColor).to.equal('green'); + expect(component.mouseOutColor).to.equal('green'); helpers.triggerMouseEvent(liEls[2], 'mouseout'); - expect(widget.mouseOutColor).to.equal('blue'); + expect(component.mouseOutColor).to.equal('blue'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/dom-events-repeated-el-non-bubbling/test.js b/test/autotests/components-browser/dom-events-repeated-el-non-bubbling/test.js index 67f4857a9..f03630476 100644 --- a/test/autotests/components-browser/dom-events-repeated-el-non-bubbling/test.js +++ b/test/autotests/components-browser/dom-events-repeated-el-non-bubbling/test.js @@ -1,18 +1,18 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: [ 'red', 'green', 'blue' ] }); - var liEls = widget.el.querySelectorAll('li'); + var liEls = component.el.querySelectorAll('li'); helpers.triggerMouseEvent(liEls[0], 'mouseover'); - expect(widget.color).to.equal('red'); + expect(component.color).to.equal('red'); helpers.triggerMouseEvent(liEls[1], 'mouseover'); - expect(widget.color).to.equal('green'); + expect(component.color).to.equal('green'); helpers.triggerMouseEvent(liEls[2], 'mouseover'); - expect(widget.color).to.equal('blue'); + expect(component.color).to.equal('blue'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-attach-el/test.js b/test/autotests/components-browser/event-attach-el/test.js index d7d75bd4a..665f8ce57 100644 --- a/test/autotests/components-browser/event-attach-el/test.js +++ b/test/autotests/components-browser/event-attach-el/test.js @@ -1,30 +1,30 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: ['red'] }); - expect(widget.events.length).to.equal(0); + expect(component.events.length).to.equal(0); - widget.input = { + component.input = { colors: ['red', 'blue'] }; - widget.update(); + component.update(); - expect(widget.events.length).to.equal(1); - expect(widget.events[0].color).to.equal('blue'); - expect(widget.events[0].node).to.equal(widget.el.querySelectorAll('li')[1]); + expect(component.events.length).to.equal(1); + expect(component.events[0].color).to.equal('blue'); + expect(component.events[0].node).to.equal(component.el.querySelectorAll('li')[1]); - widget.input = { + component.input = { colors: ['red', 'green', 'blue'] }; - widget.update(); + component.update(); - expect(widget.events.length).to.equal(2); - expect(widget.events[1].color).to.equal('green'); - expect(widget.events[1].node).to.equal(widget.el.querySelectorAll('li')[1]); + expect(component.events.length).to.equal(2); + expect(component.events[1].color).to.equal('green'); + expect(component.events[1].node).to.equal(component.el.querySelectorAll('li')[1]); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-detach-el-preventDefault/test.js b/test/autotests/components-browser/event-detach-el-preventDefault/test.js index 68e06b318..3a5806961 100644 --- a/test/autotests/components-browser/event-detach-el-preventDefault/test.js +++ b/test/autotests/components-browser/event-detach-el-preventDefault/test.js @@ -1,32 +1,32 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: ['red', 'green', 'blue'] }); - expect(widget.events.length).to.equal(0); + expect(component.events.length).to.equal(0); var finishDetach; - widget.handleDetach = function(color, event) { + component.handleDetach = function(color, event) { expect(color).to.equal('green'); finishDetach = event.detach; event.preventDefault(); }; - widget.input = { + component.input = { colors: ['red', 'blue'] }; - widget.update(); + component.update(); - expect(widget.el.querySelectorAll('li').length).to.equal(3); - expect(widget.el.querySelectorAll('li')[1].innerHTML).to.contain('green'); + expect(component.el.querySelectorAll('li').length).to.equal(3); + expect(component.el.querySelectorAll('li')[1].innerHTML).to.contain('green'); finishDetach(); - expect(widget.el.querySelectorAll('li').length).to.equal(2); - expect(widget.el.querySelectorAll('li')[1].innerHTML).to.contain('blue'); + expect(component.el.querySelectorAll('li').length).to.equal(2); + expect(component.el.querySelectorAll('li')[1].innerHTML).to.contain('blue'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-detach-el/test.js b/test/autotests/components-browser/event-detach-el/test.js index 255dc4cc1..ffbd3a375 100644 --- a/test/autotests/components-browser/event-detach-el/test.js +++ b/test/autotests/components-browser/event-detach-el/test.js @@ -1,30 +1,30 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: ['red', 'green', 'blue'] }); - expect(widget.events.length).to.equal(0); + expect(component.events.length).to.equal(0); - widget.input = { + component.input = { colors: ['red', 'blue'] }; - widget.update(); + component.update(); - expect(widget.events.length).to.equal(1); - expect(widget.events[0].color).to.equal('green'); - expect(widget.events[0].node.innerHTML).to.contain('green'); + expect(component.events.length).to.equal(1); + expect(component.events[0].color).to.equal('green'); + expect(component.events[0].node.innerHTML).to.contain('green'); - widget.input = { + component.input = { colors: ['red'] }; - widget.update(); + component.update(); - expect(widget.events.length).to.equal(2); - expect(widget.events[1].color).to.equal('blue'); - expect(widget.events[1].node.innerHTML).to.contain('blue'); + expect(component.events.length).to.equal(2); + expect(component.events[1].color).to.equal('blue'); + expect(component.events[1].node.innerHTML).to.contain('blue'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-handler-custom-args/components/app-fancy-button/component.js b/test/autotests/components-browser/event-handler-custom-args/components/app-fancy-button/component.js index cd46f9493..587f631d0 100644 --- a/test/autotests/components-browser/event-handler-custom-args/components/app-fancy-button/component.js +++ b/test/autotests/components-browser/event-handler-custom-args/components/app-fancy-button/component.js @@ -6,6 +6,6 @@ module.exports = { }, emitPressEvent: function() { - this.emit('press', { widget: this }); + this.emit('press', { component: this }); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-handler-custom-args/test.js b/test/autotests/components-browser/event-handler-custom-args/test.js index a97d8d8ac..7f62e2fa5 100644 --- a/test/autotests/components-browser/event-handler-custom-args/test.js +++ b/test/autotests/components-browser/event-handler-custom-args/test.js @@ -1,15 +1,15 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - widget.getWidget('ok').emitPressEvent(); + component.getComponent('ok').emitPressEvent(); - expect(widget.pressEvent[0].type).to.equal('ok'); - expect(widget.pressEvent[1].widget).to.equal(widget.getWidget('ok')); + expect(component.pressEvent[0].type).to.equal('ok'); + expect(component.pressEvent[1].component).to.equal(component.getComponent('ok')); - widget.getWidget('cancel').emitPressEvent(); + component.getComponent('cancel').emitPressEvent(); - expect(widget.pressEvent[0].type).to.equal('cancel'); - expect(widget.pressEvent[1].widget).to.equal(widget.getWidget('cancel')); + expect(component.pressEvent[0].type).to.equal('cancel'); + expect(component.pressEvent[1].component).to.equal(component.getComponent('cancel')); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js b/test/autotests/components-browser/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js index aec3a28eb..764271e83 100644 --- a/test/autotests/components-browser/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js +++ b/test/autotests/components-browser/event-handler-dom-args-bubbling-multiple-top-level-elements/test.js @@ -1,23 +1,23 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.buttonClickCalls.length).to.equal(0); + expect(component.buttonClickCalls.length).to.equal(0); - helpers.triggerClick(widget.getEl('ok')); + helpers.triggerClick(component.getEl('ok')); - expect(widget.buttonClickCalls.length).to.equal(1); + expect(component.buttonClickCalls.length).to.equal(1); - expect(widget.buttonClickCalls[0][0]).to.equal('ok'); - expect(widget.buttonClickCalls[0][1].stopPropagation).to.be.a('function'); - expect(widget.buttonClickCalls[0][2].innerHTML).to.equal('OK'); + expect(component.buttonClickCalls[0][0]).to.equal('ok'); + expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a('function'); + expect(component.buttonClickCalls[0][2].innerHTML).to.equal('OK'); - helpers.triggerClick(widget.getEl('cancel')); + helpers.triggerClick(component.getEl('cancel')); - expect(widget.buttonClickCalls.length).to.equal(2); + expect(component.buttonClickCalls.length).to.equal(2); - expect(widget.buttonClickCalls[1][0]).to.equal('cancel'); - expect(widget.buttonClickCalls[1][1].stopPropagation).to.be.a('function'); - expect(widget.buttonClickCalls[1][2].innerHTML).to.equal('Cancel'); + expect(component.buttonClickCalls[1][0]).to.equal('cancel'); + expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a('function'); + expect(component.buttonClickCalls[1][2].innerHTML).to.equal('Cancel'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-handler-dom-args-bubbling/test.js b/test/autotests/components-browser/event-handler-dom-args-bubbling/test.js index aec3a28eb..764271e83 100644 --- a/test/autotests/components-browser/event-handler-dom-args-bubbling/test.js +++ b/test/autotests/components-browser/event-handler-dom-args-bubbling/test.js @@ -1,23 +1,23 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.buttonClickCalls.length).to.equal(0); + expect(component.buttonClickCalls.length).to.equal(0); - helpers.triggerClick(widget.getEl('ok')); + helpers.triggerClick(component.getEl('ok')); - expect(widget.buttonClickCalls.length).to.equal(1); + expect(component.buttonClickCalls.length).to.equal(1); - expect(widget.buttonClickCalls[0][0]).to.equal('ok'); - expect(widget.buttonClickCalls[0][1].stopPropagation).to.be.a('function'); - expect(widget.buttonClickCalls[0][2].innerHTML).to.equal('OK'); + expect(component.buttonClickCalls[0][0]).to.equal('ok'); + expect(component.buttonClickCalls[0][1].stopPropagation).to.be.a('function'); + expect(component.buttonClickCalls[0][2].innerHTML).to.equal('OK'); - helpers.triggerClick(widget.getEl('cancel')); + helpers.triggerClick(component.getEl('cancel')); - expect(widget.buttonClickCalls.length).to.equal(2); + expect(component.buttonClickCalls.length).to.equal(2); - expect(widget.buttonClickCalls[1][0]).to.equal('cancel'); - expect(widget.buttonClickCalls[1][1].stopPropagation).to.be.a('function'); - expect(widget.buttonClickCalls[1][2].innerHTML).to.equal('Cancel'); + expect(component.buttonClickCalls[1][0]).to.equal('cancel'); + expect(component.buttonClickCalls[1][1].stopPropagation).to.be.a('function'); + expect(component.buttonClickCalls[1][2].innerHTML).to.equal('Cancel'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/event-handler-dom-args-non-bubbling/test.js b/test/autotests/components-browser/event-handler-dom-args-non-bubbling/test.js index 9f577ad89..0832a1580 100644 --- a/test/autotests/components-browser/event-handler-dom-args-non-bubbling/test.js +++ b/test/autotests/components-browser/event-handler-dom-args-non-bubbling/test.js @@ -1,19 +1,19 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.mouseMoveEvent).to.equal(undefined); + expect(component.mouseMoveEvent).to.equal(undefined); - helpers.triggerMouseMove(widget.getEl('ok')); + helpers.triggerMouseMove(component.getEl('ok')); - expect(widget.mouseMoveEvent[0]).to.equal('ok'); - expect(widget.mouseMoveEvent[1].stopPropagation).to.be.a('function'); - expect(widget.mouseMoveEvent[2].innerHTML).to.equal('OK'); + expect(component.mouseMoveEvent[0]).to.equal('ok'); + expect(component.mouseMoveEvent[1].stopPropagation).to.be.a('function'); + expect(component.mouseMoveEvent[2].innerHTML).to.equal('OK'); - helpers.triggerMouseMove(widget.getEl('cancel')); + helpers.triggerMouseMove(component.getEl('cancel')); - expect(widget.mouseMoveEvent[0]).to.equal('cancel'); - expect(widget.mouseMoveEvent[1].stopPropagation).to.be.a('function'); - expect(widget.mouseMoveEvent[2].innerHTML).to.equal('Cancel'); + expect(component.mouseMoveEvent[0]).to.equal('cancel'); + expect(component.mouseMoveEvent[1].stopPropagation).to.be.a('function'); + expect(component.mouseMoveEvent[2].innerHTML).to.equal('Cancel'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/extend-component/components/app-button/component.js b/test/autotests/components-browser/extend-component/components/app-button/component.js index 385817365..70255296a 100644 --- a/test/autotests/components-browser/extend-component/components/app-button/component.js +++ b/test/autotests/components-browser/extend-component/components/app-button/component.js @@ -9,7 +9,7 @@ module.exports = { }, handleClick: function(event) { - // Every Widget instance is also an EventEmitter instance. + // Every Component instance is also an EventEmitter instance. // We will emit a custom "click" event when a DOM click event // is triggered this.emit('click', { diff --git a/test/autotests/components-browser/extend-component/test.js b/test/autotests/components-browser/extend-component/test.js index 0f14f76b9..87fac4731 100644 --- a/test/autotests/components-browser/extend-component/test.js +++ b/test/autotests/components-browser/extend-component/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); module.exports = function(helpers) { - var checkboxWidget = helpers.mount(require('./components/app-checkbox'), { + var checkboxComponent = helpers.mount(require('./components/app-checkbox'), { checked: true, 'class': 'my-checkbox', data: 123 @@ -11,7 +11,7 @@ module.exports = function(helpers) { var el = helpers.targetEl.querySelector('.my-checkbox'); expect(el != null).to.equal(true); - var widgetForEl = markoWidgets.getWidgetForEl(el); + var componentForEl = markoComponents.getComponentForEl(el); - expect(widgetForEl).to.equal(checkboxWidget); + expect(componentForEl).to.equal(checkboxComponent); }; \ No newline at end of file diff --git a/test/autotests/components-browser/forceUpdate/test.js b/test/autotests/components-browser/forceUpdate/test.js index 75299381f..4913ea7d0 100644 --- a/test/autotests/components-browser/forceUpdate/test.js +++ b/test/autotests/components-browser/forceUpdate/test.js @@ -1,4 +1,4 @@ module.exports = function(helpers, done) { - var widget = helpers.mount(require('./index.marko'), {}); - widget.test(done); + var component = helpers.mount(require('./index.marko'), {}); + component.test(done); }; \ No newline at end of file diff --git a/test/autotests/components-browser/include-preserve-old/test.js b/test/autotests/components-browser/include-preserve-old/test.js index c1bb10582..9133e1827 100644 --- a/test/autotests/components-browser/include-preserve-old/test.js +++ b/test/autotests/components-browser/include-preserve-old/test.js @@ -1,20 +1,20 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank', index: 0 }); - var fooWidget = widget.getWidget('foo'); + var fooComponent = component.getComponent('foo'); - expect(fooWidget.el.querySelector('.body').innerHTML).to.equal('Current index: 0'); - expect(fooWidget.el.querySelector('span').innerHTML).to.equal('Hello Frank!'); + expect(fooComponent.el.querySelector('.body').innerHTML).to.equal('Current index: 0'); + expect(fooComponent.el.querySelector('span').innerHTML).to.equal('Hello Frank!'); - fooWidget.state.name = 'Jane'; + fooComponent.state.name = 'Jane'; - fooWidget.update(); + fooComponent.update(); - expect(fooWidget.el.querySelector('.body').innerHTML).to.equal('Current index: 0'); - expect(fooWidget.el.querySelector('span').innerHTML).to.equal('Hello Jane!'); + expect(fooComponent.el.querySelector('.body').innerHTML).to.equal('Current index: 0'); + expect(fooComponent.el.querySelector('span').innerHTML).to.equal('Hello Jane!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-checkbox/test.js b/test/autotests/components-browser/input-checkbox/test.js index ea0fbc789..7bca68552 100644 --- a/test/autotests/components-browser/input-checkbox/test.js +++ b/test/autotests/components-browser/input-checkbox/test.js @@ -1,10 +1,10 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko')); + var component = helpers.mount(require('./index.marko')); - var firstCheckbox = widget.getEl('first'); - var secondCheckbox = widget.getEl('second'); + var firstCheckbox = component.getEl('first'); + var secondCheckbox = component.getEl('second'); expect(firstCheckbox.checked).to.equal(true); expect(secondCheckbox.checked).to.equal(false); diff --git a/test/autotests/components-browser/input-no-change-nested/components/foo/test.js b/test/autotests/components-browser/input-no-change-nested/components/foo/test.js index 1adf88e2f..60bd6cda6 100644 --- a/test/autotests/components-browser/input-no-change-nested/components/foo/test.js +++ b/test/autotests/components-browser/input-no-change-nested/components/foo/test.js @@ -1,31 +1,31 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.el.querySelector('.render-count').innerHTML).to.equal('0'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.el.querySelector('.render-count').innerHTML).to.equal('0'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); // Rerender with a new props object that has the shallow properties - widget.input = { + component.input = { name: 'Frank' }; - widget.update(); + component.update(); - expect(widget.el.querySelector('.render-count').innerHTML).to.equal('0'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.el.querySelector('.render-count').innerHTML).to.equal('0'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); // Rerender with a new props object that has the shallow properties - widget.input = { + component.input = { name: 'John' }; - widget.update(); + component.update(); - expect(widget.el.querySelector('.render-count').innerHTML).to.equal('1'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('John'); + expect(component.el.querySelector('.render-count').innerHTML).to.equal('1'); + expect(component.el.querySelector('.name').innerHTML).to.equal('John'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-no-change-nested/test.js b/test/autotests/components-browser/input-no-change-nested/test.js index afec8400a..bfe940744 100644 --- a/test/autotests/components-browser/input-no-change-nested/test.js +++ b/test/autotests/components-browser/input-no-change-nested/test.js @@ -1,31 +1,31 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.getWidget('foo').el.querySelector('.render-count').innerHTML).to.equal('0'); - expect(widget.getWidget('foo').el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.getComponent('foo').el.querySelector('.render-count').innerHTML).to.equal('0'); + expect(component.getComponent('foo').el.querySelector('.name').innerHTML).to.equal('Frank'); // Rerender with a new props object that has the shallow properties - widget.input = { + component.input = { name: 'Frank' }; - widget.update(); + component.update(); - expect(widget.getWidget('foo').el.querySelector('.render-count').innerHTML).to.equal('0'); - expect(widget.getWidget('foo').el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.getComponent('foo').el.querySelector('.render-count').innerHTML).to.equal('0'); + expect(component.getComponent('foo').el.querySelector('.name').innerHTML).to.equal('Frank'); // Rerender with a new props object that has the shallow properties - widget.input = { + component.input = { name: 'John' }; - widget.update(); + component.update(); - expect(widget.getWidget('foo').el.querySelector('.render-count').innerHTML).to.equal('1'); - expect(widget.getWidget('foo').el.querySelector('.name').innerHTML).to.equal('John'); + expect(component.getComponent('foo').el.querySelector('.render-count').innerHTML).to.equal('1'); + expect(component.getComponent('foo').el.querySelector('.name').innerHTML).to.equal('John'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-no-change/test.js b/test/autotests/components-browser/input-no-change/test.js index 1adf88e2f..60bd6cda6 100644 --- a/test/autotests/components-browser/input-no-change/test.js +++ b/test/autotests/components-browser/input-no-change/test.js @@ -1,31 +1,31 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.el.querySelector('.render-count').innerHTML).to.equal('0'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.el.querySelector('.render-count').innerHTML).to.equal('0'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); // Rerender with a new props object that has the shallow properties - widget.input = { + component.input = { name: 'Frank' }; - widget.update(); + component.update(); - expect(widget.el.querySelector('.render-count').innerHTML).to.equal('0'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.el.querySelector('.render-count').innerHTML).to.equal('0'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); // Rerender with a new props object that has the shallow properties - widget.input = { + component.input = { name: 'John' }; - widget.update(); + component.update(); - expect(widget.el.querySelector('.render-count').innerHTML).to.equal('1'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('John'); + expect(component.el.querySelector('.render-count').innerHTML).to.equal('1'); + expect(component.el.querySelector('.name').innerHTML).to.equal('John'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-no-value/test.js b/test/autotests/components-browser/input-no-value/test.js index 298df7081..c1c7ecc19 100644 --- a/test/autotests/components-browser/input-no-value/test.js +++ b/test/autotests/components-browser/input-no-value/test.js @@ -1,12 +1,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko')); + var component = helpers.mount(require('./index.marko')); - expect(widget.getEl('searchInput').value).to.equal(''); + expect(component.getEl('searchInput').value).to.equal(''); - widget.increment(); - widget.update(); + component.increment(); + component.update(); - expect(widget.getEl('searchInput').value).to.equal(''); + expect(component.getEl('searchInput').value).to.equal(''); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-persisted-nested-component/test.js b/test/autotests/components-browser/input-persisted-nested-component/test.js index 2c8a2677f..640694dd9 100644 --- a/test/autotests/components-browser/input-persisted-nested-component/test.js +++ b/test/autotests/components-browser/input-persisted-nested-component/test.js @@ -1,31 +1,31 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { color:'red' }); - expect(widget.el.getAttribute('style')).to.equal('color:red;'); - expect(widget.getWidget('counter').el.getAttribute('style')).to.equal('color:red;'); - expect(widget.getWidget('counter').el.querySelector('.count').innerHTML).to.equal('0'); + expect(component.el.getAttribute('style')).to.equal('color:red;'); + expect(component.getComponent('counter').el.getAttribute('style')).to.equal('color:red;'); + expect(component.getComponent('counter').el.querySelector('.count').innerHTML).to.equal('0'); - widget.getWidget('counter').increment(); - widget.getWidget('counter').update(); + component.getComponent('counter').increment(); + component.getComponent('counter').update(); - expect(widget.el.getAttribute('style')).to.equal('color:red;'); - expect(widget.getWidget('counter').el.getAttribute('style')).to.equal('color:red;'); - expect(widget.getWidget('counter').el.querySelector('.count').innerHTML).to.equal('1'); + expect(component.el.getAttribute('style')).to.equal('color:red;'); + expect(component.getComponent('counter').el.getAttribute('style')).to.equal('color:red;'); + expect(component.getComponent('counter').el.querySelector('.count').innerHTML).to.equal('1'); - widget.updateColor('green'); - widget.update(); + component.updateColor('green'); + component.update(); - expect(widget.el.getAttribute('style')).to.equal('color:green;'); - expect(widget.getWidget('counter').el.getAttribute('style')).to.equal('color:green;'); - expect(widget.getWidget('counter').el.querySelector('.count').innerHTML).to.equal('1'); + expect(component.el.getAttribute('style')).to.equal('color:green;'); + expect(component.getComponent('counter').el.getAttribute('style')).to.equal('color:green;'); + expect(component.getComponent('counter').el.querySelector('.count').innerHTML).to.equal('1'); // - // expect(widget.el.style.color).to.equal('#09c;'); - // expect(widget.getWidget('counter').el.style.color).to.equal('#09c;'); + // expect(component.el.style.color).to.equal('#09c;'); + // expect(component.getComponent('counter').el.style.color).to.equal('#09c;'); // - // expect(widget.getEl('current').getAttribute('style')).to.equal('color:#09c;'); + // expect(component.getEl('current').getAttribute('style')).to.equal('color:#09c;'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-persisted/test.js b/test/autotests/components-browser/input-persisted/test.js index aeef9b6be..0bedac1ad 100644 --- a/test/autotests/components-browser/input-persisted/test.js +++ b/test/autotests/components-browser/input-persisted/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { color:'#09c' }); - expect(widget.getEl('current').getAttribute('style')).to.equal('color:#09c;'); + expect(component.getEl('current').getAttribute('style')).to.equal('color:#09c;'); - widget.increment(); - widget.update(); + component.increment(); + component.update(); - expect(widget.getEl('current').getAttribute('style')).to.equal('color:#09c;'); + expect(component.getEl('current').getAttribute('style')).to.equal('color:#09c;'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/input-value-zero/test.js b/test/autotests/components-browser/input-value-zero/test.js index 48046aa8f..f45aa1901 100644 --- a/test/autotests/components-browser/input-value-zero/test.js +++ b/test/autotests/components-browser/input-value-zero/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { value: 1 }); - expect(widget.getEl('input').value).to.equal('1'); + expect(component.getEl('input').value).to.equal('1'); - widget.state.value = 0; - widget.update(); + component.state.value = 0; + component.update(); - expect(widget.getEl('input').value).to.equal('0'); + expect(component.getEl('input').value).to.equal('0'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/lifecyle-hooks-constructor/test.js b/test/autotests/components-browser/lifecyle-hooks-constructor/test.js index 4f1dff237..16eb6a7e4 100644 --- a/test/autotests/components-browser/lifecyle-hooks-constructor/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-constructor/test.js @@ -1,19 +1,19 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); - expect(widget.onInputCalls).to.deep.equal([ + var component = helpers.mount(require('./index'), { name: 'Frank' }); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.onInputCalls).to.deep.equal([ { name: 'INITIAL' } ]); - expect(widget.name).to.equal('Frank'); + expect(component.name).to.equal('Frank'); - widget.input = { name: 'John' }; - widget.update(); + component.input = { name: 'John' }; + component.update(); - expect(widget.onInputCalls).to.deep.equal([ + expect(component.onInputCalls).to.deep.equal([ { name: 'INITIAL' }, @@ -22,6 +22,6 @@ module.exports = function(helpers) { } ]); - expect(widget.el.querySelector('.name').innerHTML).to.equal('John'); - expect(widget.name).to.equal('John'); + expect(component.el.querySelector('.name').innerHTML).to.equal('John'); + expect(component.name).to.equal('John'); }; diff --git a/test/autotests/components-browser/lifecyle-hooks-destroy/test.js b/test/autotests/components-browser/lifecyle-hooks-destroy/test.js index c01ded2b9..a0fd7b150 100644 --- a/test/autotests/components-browser/lifecyle-hooks-destroy/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-destroy/test.js @@ -2,9 +2,9 @@ var expect = require('chai').expect; var hooks = require('./hooks'); module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); + var component = helpers.mount(require('./index'), { name: 'Frank' }); - widget.destroy(); + component.destroy(); expect(hooks.getHookNames()).deep.equal(['root:destroy', 'foo:destroy']); }; diff --git a/test/autotests/components-browser/lifecyle-hooks-nested-no-id/test.js b/test/autotests/components-browser/lifecyle-hooks-nested-no-id/test.js index f4f66d803..6ea2f157b 100644 --- a/test/autotests/components-browser/lifecyle-hooks-nested-no-id/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-nested-no-id/test.js @@ -2,18 +2,18 @@ var expect = require('chai').expect; var hooks = require('./hooks'); module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); + var component = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.el.querySelector('.foo .name').innerHTML).to.equal('Frank'); + expect(component.el.querySelector('.foo .name').innerHTML).to.equal('Frank'); expect(hooks.getHookNames('foo')).to.deep.equal(['create', 'render', 'mount']); expect(hooks.getHookNames('root')).to.deep.equal(['create', 'render', 'mount']); hooks.reset(); - widget.input = { name: 'John' }; - widget.update(); + component.input = { name: 'John' }; + component.update(); - expect(widget.el.querySelector('.foo .name').innerHTML).to.equal('John'); + expect(component.el.querySelector('.foo .name').innerHTML).to.equal('John'); expect(hooks.getHookNames('foo')).to.deep.equal(['render', 'update']); expect(hooks.getHookNames('root')).to.deep.equal(['render', 'update']); }; diff --git a/test/autotests/components-browser/lifecyle-hooks-nested-with-id/test.js b/test/autotests/components-browser/lifecyle-hooks-nested-with-id/test.js index f4f66d803..6ea2f157b 100644 --- a/test/autotests/components-browser/lifecyle-hooks-nested-with-id/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-nested-with-id/test.js @@ -2,18 +2,18 @@ var expect = require('chai').expect; var hooks = require('./hooks'); module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); + var component = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.el.querySelector('.foo .name').innerHTML).to.equal('Frank'); + expect(component.el.querySelector('.foo .name').innerHTML).to.equal('Frank'); expect(hooks.getHookNames('foo')).to.deep.equal(['create', 'render', 'mount']); expect(hooks.getHookNames('root')).to.deep.equal(['create', 'render', 'mount']); hooks.reset(); - widget.input = { name: 'John' }; - widget.update(); + component.input = { name: 'John' }; + component.update(); - expect(widget.el.querySelector('.foo .name').innerHTML).to.equal('John'); + expect(component.el.querySelector('.foo .name').innerHTML).to.equal('John'); expect(hooks.getHookNames('foo')).to.deep.equal(['render', 'update']); expect(hooks.getHookNames('root')).to.deep.equal(['render', 'update']); }; diff --git a/test/autotests/components-browser/lifecyle-hooks-parent-child-ordering/test.js b/test/autotests/components-browser/lifecyle-hooks-parent-child-ordering/test.js index d5a02c942..2139f1c91 100644 --- a/test/autotests/components-browser/lifecyle-hooks-parent-child-ordering/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-parent-child-ordering/test.js @@ -2,7 +2,7 @@ var expect = require('chai').expect; var hooks = require('./hooks'); module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); + var component = helpers.mount(require('./index'), { name: 'Frank' }); expect(hooks.getHookNames()).deep.equal([ "root:create", "root:render", @@ -14,8 +14,8 @@ module.exports = function(helpers) { hooks.reset(); - widget.input = { name: 'John' }; - widget.update(); + component.input = { name: 'John' }; + component.update(); expect(hooks.getHookNames()).deep.equal([ "root:render", diff --git a/test/autotests/components-browser/lifecyle-hooks-render-arg/test.js b/test/autotests/components-browser/lifecyle-hooks-render-arg/test.js index 755198396..bf5210beb 100644 --- a/test/autotests/components-browser/lifecyle-hooks-render-arg/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-render-arg/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); + var component = helpers.mount(require('./index'), { name: 'Frank' }); - var out1 = widget.renderArg; + var out1 = component.renderArg; - widget.input = { name: 'John' }; - widget.update(); + component.input = { name: 'John' }; + component.update(); - var out2 = widget.renderArg; + var out2 = component.renderArg; expect(out1).to.not.equal(out2); expect(out1.element).to.be.a('function'); diff --git a/test/autotests/components-browser/lifecyle-hooks-root/test.js b/test/autotests/components-browser/lifecyle-hooks-root/test.js index 339954e49..4971be878 100644 --- a/test/autotests/components-browser/lifecyle-hooks-root/test.js +++ b/test/autotests/components-browser/lifecyle-hooks-root/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); - expect(widget.hookNames).to.deep.equal(['create', 'render', 'mount']); - widget.reset(); + var component = helpers.mount(require('./index'), { name: 'Frank' }); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.hookNames).to.deep.equal(['create', 'render', 'mount']); + component.reset(); - widget.input = { name: 'John' }; - widget.update(); + component.input = { name: 'John' }; + component.update(); - expect(widget.el.querySelector('.name').innerHTML).to.equal('John'); - expect(widget.hookNames).to.deep.equal(['render', 'update']); + expect(component.el.querySelector('.name').innerHTML).to.equal('John'); + expect(component.hookNames).to.deep.equal(['render', 'update']); }; diff --git a/test/autotests/components-browser/onCreate/test.js b/test/autotests/components-browser/onCreate/test.js index 347e8ea1e..22a84bdbf 100644 --- a/test/autotests/components-browser/onCreate/test.js +++ b/test/autotests/components-browser/onCreate/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { name: 'Frank', $global: { name: 'Frank' } }); - var onCreateArgs = widget.onCreateArgs; + var onCreateArgs = component.onCreateArgs; var onCreateInput = onCreateArgs[0]; var onCreateOut = onCreateArgs[1]; diff --git a/test/autotests/components-browser/onInput-instance-data/test.js b/test/autotests/components-browser/onInput-instance-data/test.js index 0b9744562..63e485252 100644 --- a/test/autotests/components-browser/onInput-instance-data/test.js +++ b/test/autotests/components-browser/onInput-instance-data/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; -require('./widget'); +require('./component'); module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.string).to.equal('world'); - expect(widget.number).to.equal(12); - expect(widget.boolean).to.equal(true); - expect(widget.complex).to.deep.equal({ + expect(component.string).to.equal('world'); + expect(component.number).to.equal(12); + expect(component.boolean).to.equal(true); + expect(component.complex).to.deep.equal({ a: '<\"hello">', b: 'test' }); diff --git a/test/autotests/components-browser/onInput-instance-data/widget.js b/test/autotests/components-browser/onInput-instance-data/widget.js index 99b4bfd66..18b84270e 100644 --- a/test/autotests/components-browser/onInput-instance-data/widget.js +++ b/test/autotests/components-browser/onInput-instance-data/widget.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - this.name = 'app-widget-config'; + this.name = 'app-component-config'; } }; \ No newline at end of file diff --git a/test/autotests/components-browser/onInput-return/test.js b/test/autotests/components-browser/onInput-return/test.js index 852fc2765..7703acf7b 100644 --- a/test/autotests/components-browser/onInput-return/test.js +++ b/test/autotests/components-browser/onInput-return/test.js @@ -1,19 +1,19 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.input.name).to.equal('FRANK'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('FRANK'); + expect(component.input.name).to.equal('FRANK'); + expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK'); - widget.input = { + component.input = { name: 'John' }; - widget.update(); + component.update(); - expect(widget.input.name).to.equal('JOHN'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('JOHN'); + expect(component.input.name).to.equal('JOHN'); + expect(component.el.querySelector('.name').innerHTML).to.equal('JOHN'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/onInput/test.js b/test/autotests/components-browser/onInput/test.js index 2ae4b8e3e..82e0234b7 100644 --- a/test/autotests/components-browser/onInput/test.js +++ b/test/autotests/components-browser/onInput/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.onMountCalled).to.eql(true); + expect(component.onMountCalled).to.eql(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/preserve-dom-body-no-id/test.js b/test/autotests/components-browser/preserve-dom-body-no-id/test.js index 58cd1e5bf..b3fba4b9b 100644 --- a/test/autotests/components-browser/preserve-dom-body-no-id/test.js +++ b/test/autotests/components-browser/preserve-dom-body-no-id/test.js @@ -3,20 +3,20 @@ var expect = require('chai').expect; module.exports = function(helpers) { var counter = 0; - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { counter: counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); - expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); - widget.rerender({ + component.rerender({ counter: ++counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); - expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('1'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); + expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('1'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/preserve-dom-body/test.js b/test/autotests/components-browser/preserve-dom-body/test.js index 12c1fb47e..cf6fce197 100644 --- a/test/autotests/components-browser/preserve-dom-body/test.js +++ b/test/autotests/components-browser/preserve-dom-body/test.js @@ -3,20 +3,20 @@ var expect = require('chai').expect; module.exports = function(helpers) { var counter = 0; - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { counter: counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); - expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('0'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); + expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('0'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); - widget.rerender({ + component.rerender({ counter: ++counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); - expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('1'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); + expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('1'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/preserve-dom-no-id/test.js b/test/autotests/components-browser/preserve-dom-no-id/test.js index c2f480264..1a26bdcb6 100644 --- a/test/autotests/components-browser/preserve-dom-no-id/test.js +++ b/test/autotests/components-browser/preserve-dom-no-id/test.js @@ -3,20 +3,20 @@ var expect = require('chai').expect; module.exports = function(helpers) { var counter = 0; - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { counter: counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); - expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); - widget.rerender({ + component.rerender({ counter: ++counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); - expect(widget.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); + expect(component.el.querySelector('.preserve').getAttribute('data-counter')).to.equal('0'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/preserve-dom/test.js b/test/autotests/components-browser/preserve-dom/test.js index a3bf05b11..dc1cd9d0e 100644 --- a/test/autotests/components-browser/preserve-dom/test.js +++ b/test/autotests/components-browser/preserve-dom/test.js @@ -3,20 +3,20 @@ var expect = require('chai').expect; module.exports = function(helpers) { var counter = 0; - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { counter: counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); - expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('0'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('0'); + expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('0'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); - widget.rerender({ + component.rerender({ counter: ++counter }); - expect(widget.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); - expect(widget.getEl('preserve').getAttribute('data-counter')).to.equal('0'); - expect(widget.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); + expect(component.el.querySelector('.unpreserved-counter').innerHTML).to.equal('1'); + expect(component.getEl('preserve').getAttribute('data-counter')).to.equal('0'); + expect(component.el.querySelector('.preserved-counter').innerHTML).to.equal('0'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/ref-nested-component-multiple-root-els-with-refs/test.js b/test/autotests/components-browser/ref-nested-component-multiple-root-els-with-refs/test.js index 86322b395..3a01745f4 100644 --- a/test/autotests/components-browser/ref-nested-component-multiple-root-els-with-refs/test.js +++ b/test/autotests/components-browser/ref-nested-component-multiple-root-els-with-refs/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); - var fooWidget = widget.getWidget('foo'); - expect(fooWidget != null).to.equal(true); - expect(fooWidget.getName()).to.equal('Frank'); - expect(fooWidget.getAge()).to.equal('30'); + var component = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); + var fooComponent = component.getComponent('foo'); + expect(fooComponent != null).to.equal(true); + expect(fooComponent.getName()).to.equal('Frank'); + expect(fooComponent.getAge()).to.equal('30'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/ref-nested-component-multiple-root-els/test.js b/test/autotests/components-browser/ref-nested-component-multiple-root-els/test.js index 86322b395..3a01745f4 100644 --- a/test/autotests/components-browser/ref-nested-component-multiple-root-els/test.js +++ b/test/autotests/components-browser/ref-nested-component-multiple-root-els/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); - var fooWidget = widget.getWidget('foo'); - expect(fooWidget != null).to.equal(true); - expect(fooWidget.getName()).to.equal('Frank'); - expect(fooWidget.getAge()).to.equal('30'); + var component = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); + var fooComponent = component.getComponent('foo'); + expect(fooComponent != null).to.equal(true); + expect(fooComponent.getName()).to.equal('Frank'); + expect(fooComponent.getAge()).to.equal('30'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/repeated-with-label-ref/test.js b/test/autotests/components-browser/repeated-with-label-ref/test.js index 812039fb2..3d524eecb 100644 --- a/test/autotests/components-browser/repeated-with-label-ref/test.js +++ b/test/autotests/components-browser/repeated-with-label-ref/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { fields: [ { value: 'name', @@ -14,7 +14,7 @@ module.exports = function(helpers) { ] }); - var inputs = widget.getEls('field'); + var inputs = component.getEls('field'); expect(inputs.length).to.equal(2); expect(inputs[0].value).to.equal('name'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/replaceChildrenOf/test.js b/test/autotests/components-browser/replaceChildrenOf/test.js index 862f80a95..58a394c20 100644 --- a/test/autotests/components-browser/replaceChildrenOf/test.js +++ b/test/autotests/components-browser/replaceChildrenOf/test.js @@ -2,13 +2,13 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko')); + var component = helpers.mount(require('./index.marko')); - var initialCounter = widget.getWidget('initialCounter'); + var initialCounter = component.getComponent('initialCounter'); var counter = require('./components/app-counter'); - var renderTarget = widget.getEl('renderTarget'); + var renderTarget = component.getEl('renderTarget'); expect(renderTarget.innerHTML).to.contain('Count: 0'); counter.renderSync({ value: 99 }).replaceChildrenOf(renderTarget); diff --git a/test/autotests/components-browser/rerender-same-id/test.js b/test/autotests/components-browser/rerender-same-id/test.js index 6aef93a47..26395c777 100644 --- a/test/autotests/components-browser/rerender-same-id/test.js +++ b/test/autotests/components-browser/rerender-same-id/test.js @@ -1,15 +1,15 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { label: 'Foo' }); - var oldId = widget.id; + var oldId = component.id; - widget.rerender({ + component.rerender({ label: 'Bar' }); - expect(widget.el.id).to.equal(oldId); + expect(component.el.id).to.equal(oldId); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-custom-event/index.marko b/test/autotests/components-browser/sanity-check-custom-event/index.marko index 869019dad..79ec5bb78 100644 --- a/test/autotests/components-browser/sanity-check-custom-event/index.marko +++ b/test/autotests/components-browser/sanity-check-custom-event/index.marko @@ -5,8 +5,8 @@ class { onMount() { var fooEl = document.querySelector('.foo'); - var fooWidget = this.fooWidget = require('marko/widgets').getWidgetForEl(fooEl); - fooWidget.emitTestEvent(); + var fooComponent = this.fooComponent = require('marko/components').getComponentForEl(fooEl); + fooComponent.emitTestEvent(); } handleFooTest() { this.fooEvent = arguments; diff --git a/test/autotests/components-browser/sanity-check-custom-event/test.js b/test/autotests/components-browser/sanity-check-custom-event/test.js index 984ae262b..1b47fd457 100644 --- a/test/autotests/components-browser/sanity-check-custom-event/test.js +++ b/test/autotests/components-browser/sanity-check-custom-event/test.js @@ -2,10 +2,10 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { name: 'Frank' }); + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.fooEvent.length).to.equal(3); - expect(widget.fooEvent[0]).to.equal('abc'); - expect(widget.fooEvent[1]).to.equal('123'); - expect(widget.fooEvent[2]).to.equal(widget.fooWidget); + expect(component.fooEvent.length).to.equal(3); + expect(component.fooEvent[0]).to.equal('abc'); + expect(component.fooEvent[1]).to.equal('123'); + expect(component.fooEvent[2]).to.equal(component.fooComponent); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-implicit-bind-component/test.js b/test/autotests/components-browser/sanity-check-implicit-bind-component/test.js index 3f0a43721..5285f437e 100644 --- a/test/autotests/components-browser/sanity-check-implicit-bind-component/test.js +++ b/test/autotests/components-browser/sanity-check-implicit-bind-component/test.js @@ -2,13 +2,13 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); + var component = helpers.mount(require('./index'), { name: 'Frank', age: 30 }); - expect(widget.el.innerHTML).to.equal('Frank'); + expect(component.el.innerHTML).to.equal('Frank'); - widget.setName('Jane'); + component.setName('Jane'); - widget.update(); + component.update(); - expect(widget.el.innerHTML).to.equal('Jane'); + expect(component.el.innerHTML).to.equal('Jane'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-inline/test.js b/test/autotests/components-browser/sanity-check-inline/test.js index a6e0bec19..a41731cf0 100644 --- a/test/autotests/components-browser/sanity-check-inline/test.js +++ b/test/autotests/components-browser/sanity-check-inline/test.js @@ -2,12 +2,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { name: 'Frank' }); + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello Frank!'); - widget.setName('Jane'); - widget.update(); + component.setName('Jane'); + component.update(); - expect(widget.el.innerHTML).to.contain('Hello Jane!'); + expect(component.el.innerHTML).to.contain('Hello Jane!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-key/test.js b/test/autotests/components-browser/sanity-check-key/test.js index 6c9a73a23..3a8cbe644 100644 --- a/test/autotests/components-browser/sanity-check-key/test.js +++ b/test/autotests/components-browser/sanity-check-key/test.js @@ -1,11 +1,11 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { }); + var component = helpers.mount(require('./index'), { }); - var fooWidget = widget.getWidget('foo'); - expect(fooWidget.el.className).to.equal('foo'); + var fooComponent = component.getComponent('foo'); + expect(fooComponent.el.className).to.equal('foo'); - var link = widget.getEl('link'); + var link = component.getEl('link'); expect(link.nodeName).to.equal('A'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-multiple-root-els/test.js b/test/autotests/components-browser/sanity-check-multiple-root-els/test.js index 47130c4a5..b1bcded3c 100644 --- a/test/autotests/components-browser/sanity-check-multiple-root-els/test.js +++ b/test/autotests/components-browser/sanity-check-multiple-root-els/test.js @@ -2,19 +2,19 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { name: 'Frank', age: 30, url: 'http://ebay.com/' }); + var component = helpers.mount(require('./index'), { name: 'Frank', age: 30, url: 'http://ebay.com/' }); - expect(widget.getEl('name').innerHTML).to.equal('Frank'); - expect(widget.getEl('age').innerHTML).to.equal('30'); - expect(widget.els[2].href).to.equal('http://ebay.com/'); + expect(component.getEl('name').innerHTML).to.equal('Frank'); + expect(component.getEl('age').innerHTML).to.equal('30'); + expect(component.els[2].href).to.equal('http://ebay.com/'); - widget.setName('Jane'); - widget.setAge(50); - widget.setUrl('http://ebay.com/search/'); + component.setName('Jane'); + component.setAge(50); + component.setUrl('http://ebay.com/search/'); - widget.update(); + component.update(); - expect(widget.getEl('name').innerHTML).to.equal('Jane'); - expect(widget.getEl('age').innerHTML).to.equal('50'); - expect(widget.els[2].href).to.equal('http://ebay.com/search/'); + expect(component.getEl('name').innerHTML).to.equal('Jane'); + expect(component.getEl('age').innerHTML).to.equal('50'); + expect(component.els[2].href).to.equal('http://ebay.com/search/'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-single-file-component/test.js b/test/autotests/components-browser/sanity-check-single-file-component/test.js index a6e0bec19..a41731cf0 100644 --- a/test/autotests/components-browser/sanity-check-single-file-component/test.js +++ b/test/autotests/components-browser/sanity-check-single-file-component/test.js @@ -2,12 +2,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { name: 'Frank' }); + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello Frank!'); - widget.setName('Jane'); - widget.update(); + component.setName('Jane'); + component.update(); - expect(widget.el.innerHTML).to.contain('Hello Jane!'); + expect(component.el.innerHTML).to.contain('Hello Jane!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-template-entry-split/test.js b/test/autotests/components-browser/sanity-check-template-entry-split/test.js index 3c3bb265d..751f00ef0 100644 --- a/test/autotests/components-browser/sanity-check-template-entry-split/test.js +++ b/test/autotests/components-browser/sanity-check-template-entry-split/test.js @@ -2,11 +2,11 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { name: 'Frank' }); + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.el.innerHTML).to.contain('FRANK'); + expect(component.el.innerHTML).to.contain('FRANK'); - widget.setName('Jane'); + component.setName('Jane'); - expect(widget.el.innerHTML).to.contain('Jane'); + expect(component.el.innerHTML).to.contain('Jane'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/sanity-check-template-entry/test.js b/test/autotests/components-browser/sanity-check-template-entry/test.js index a6e0bec19..a41731cf0 100644 --- a/test/autotests/components-browser/sanity-check-template-entry/test.js +++ b/test/autotests/components-browser/sanity-check-template-entry/test.js @@ -2,12 +2,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko'), { name: 'Frank' }); + var component = helpers.mount(require('./index.marko'), { name: 'Frank' }); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello Frank!'); - widget.setName('Jane'); - widget.update(); + component.setName('Jane'); + component.update(); - expect(widget.el.innerHTML).to.contain('Hello Jane!'); + expect(component.el.innerHTML).to.contain('Hello Jane!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/state-freeze/test.js b/test/autotests/components-browser/state-freeze/test.js index 8ba91b2ba..e1b364494 100644 --- a/test/autotests/components-browser/state-freeze/test.js +++ b/test/autotests/components-browser/state-freeze/test.js @@ -3,9 +3,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); expect(function() { - widget.state.foo = 'bar'; + component.state.foo = 'bar'; }).to.throw(TypeError); }; \ No newline at end of file diff --git a/test/autotests/components-browser/state-null-undefined/test.js b/test/autotests/components-browser/state-null-undefined/test.js index 041b3c819..b60844548 100644 --- a/test/autotests/components-browser/state-null-undefined/test.js +++ b/test/autotests/components-browser/state-null-undefined/test.js @@ -3,8 +3,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.state.nameNull).to.equal(null); - expect(widget.state.nameUndefined).to.equal(undefined); + expect(component.state.nameNull).to.equal(null); + expect(component.state.nameUndefined).to.equal(undefined); }; \ No newline at end of file diff --git a/test/autotests/components-browser/state-var/test.js b/test/autotests/components-browser/state-var/test.js index cc1910414..7140dfd36 100644 --- a/test/autotests/components-browser/state-var/test.js +++ b/test/autotests/components-browser/state-var/test.js @@ -1,6 +1,6 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.el.innerHTML).to.contain('Frank'); + var component = helpers.mount(require('./index'), {}); + expect(component.el.innerHTML).to.contain('Frank'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/state-watch-null-async/test.js b/test/autotests/components-browser/state-watch-null-async/test.js index 09b8e871f..4a6ccaa5c 100644 --- a/test/autotests/components-browser/state-watch-null-async/test.js +++ b/test/autotests/components-browser/state-watch-null-async/test.js @@ -2,14 +2,14 @@ var expect = require('chai').expect; module.exports = function(helpers, done) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.el.innerHTML).to.not.contain('FATAL ERROR'); + expect(component.el.innerHTML).to.not.contain('FATAL ERROR'); - helpers.triggerEvent(widget.getEl(), 'submit'); + helpers.triggerEvent(component.getEl(), 'submit'); setTimeout(function() { - expect(widget.el.innerHTML).to.contain('FATAL ERROR'); + expect(component.el.innerHTML).to.contain('FATAL ERROR'); done(); }, 100); }; diff --git a/test/autotests/components-browser/state-watch-null/test.js b/test/autotests/components-browser/state-watch-null/test.js index 9984a2e94..7ef389058 100644 --- a/test/autotests/components-browser/state-watch-null/test.js +++ b/test/autotests/components-browser/state-watch-null/test.js @@ -1,10 +1,10 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.el.innerHTML).to.contain('Hello !'); - widget.state.name = 'Frank'; - widget.update(); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello !'); + component.state.name = 'Frank'; + component.update(); + expect(component.el.innerHTML).to.contain('Hello Frank!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/state-watch-undefined/test.js b/test/autotests/components-browser/state-watch-undefined/test.js index 9984a2e94..7ef389058 100644 --- a/test/autotests/components-browser/state-watch-undefined/test.js +++ b/test/autotests/components-browser/state-watch-undefined/test.js @@ -1,10 +1,10 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.el.innerHTML).to.contain('Hello !'); - widget.state.name = 'Frank'; - widget.update(); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello !'); + component.state.name = 'Frank'; + component.update(); + expect(component.el.innerHTML).to.contain('Hello Frank!'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/textarea/test.js b/test/autotests/components-browser/textarea/test.js index 66e94c0e9..8dd8a2160 100644 --- a/test/autotests/components-browser/textarea/test.js +++ b/test/autotests/components-browser/textarea/test.js @@ -1,12 +1,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index.marko')); + var component = helpers.mount(require('./index.marko')); - expect(widget.el.querySelector('pre').innerHTML).to.equal(''); + expect(component.el.querySelector('pre').innerHTML).to.equal(''); - widget.submit(); - widget.update(); + component.submit(); + component.update(); - expect(widget.el.querySelector('pre').innerHTML).to.equal('Placeholder error'); + expect(component.el.querySelector('pre').innerHTML).to.equal('Placeholder error'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/transclusion-body-slot-attr/test.js b/test/autotests/components-browser/transclusion-body-slot-attr/test.js index a27c011a9..14ed218f7 100644 --- a/test/autotests/components-browser/transclusion-body-slot-attr/test.js +++ b/test/autotests/components-browser/transclusion-body-slot-attr/test.js @@ -1,23 +1,23 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - var buttonWidget = widget.getWidget('button'); - expect(buttonWidget.el.innerHTML).to.contain('Frank'); - expect(buttonWidget.el.className).to.equal('app-button app-button-small'); + var buttonComponent = component.getComponent('button'); + expect(buttonComponent.el.innerHTML).to.contain('Frank'); + expect(buttonComponent.el.className).to.equal('app-button app-button-small'); - // Button widget will not rerender since it's state did not change and that means that the + // Button component will not rerender since it's state did not change and that means that the // button content will remain as 'John' instead of 'Frank' - widget.input = { name: 'John '}; - widget.update(); + component.input = { name: 'John '}; + component.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.innerHTML).to.contain('John'); - buttonWidget.setSize('large'); - buttonWidget.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); - expect(buttonWidget.el.className).to.equal('app-button app-button-large'); + buttonComponent.setSize('large'); + buttonComponent.update(); + expect(buttonComponent.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.className).to.equal('app-button app-button-large'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/transclusion-body-slot-default-to-renderBody/test.js b/test/autotests/components-browser/transclusion-body-slot-default-to-renderBody/test.js index 228920b08..8d2b3573d 100644 --- a/test/autotests/components-browser/transclusion-body-slot-default-to-renderBody/test.js +++ b/test/autotests/components-browser/transclusion-body-slot-default-to-renderBody/test.js @@ -1,21 +1,21 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - var buttonWidget = widget.getWidget('button'); - expect(buttonWidget.el.innerHTML).to.contain('Frank'); - expect(buttonWidget.el.className).to.equal('app-button app-button-small'); + var buttonComponent = component.getComponent('button'); + expect(buttonComponent.el.innerHTML).to.contain('Frank'); + expect(buttonComponent.el.className).to.equal('app-button app-button-small'); - widget.input = { name: 'John '}; - widget.update(); + component.input = { name: 'John '}; + component.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.innerHTML).to.contain('John'); - buttonWidget.setSize('large'); - buttonWidget.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); - expect(buttonWidget.el.className).to.equal('app-button app-button-large'); + buttonComponent.setSize('large'); + buttonComponent.update(); + expect(buttonComponent.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.className).to.equal('app-button app-button-large'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/transclusion-body-slot-tag/test.js b/test/autotests/components-browser/transclusion-body-slot-tag/test.js index 228920b08..8d2b3573d 100644 --- a/test/autotests/components-browser/transclusion-body-slot-tag/test.js +++ b/test/autotests/components-browser/transclusion-body-slot-tag/test.js @@ -1,21 +1,21 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - var buttonWidget = widget.getWidget('button'); - expect(buttonWidget.el.innerHTML).to.contain('Frank'); - expect(buttonWidget.el.className).to.equal('app-button app-button-small'); + var buttonComponent = component.getComponent('button'); + expect(buttonComponent.el.innerHTML).to.contain('Frank'); + expect(buttonComponent.el.className).to.equal('app-button app-button-small'); - widget.input = { name: 'John '}; - widget.update(); + component.input = { name: 'John '}; + component.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.innerHTML).to.contain('John'); - buttonWidget.setSize('large'); - buttonWidget.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); - expect(buttonWidget.el.className).to.equal('app-button app-button-large'); + buttonComponent.setSize('large'); + buttonComponent.update(); + expect(buttonComponent.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.className).to.equal('app-button app-button-large'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/transclusion-include-from-state/test.js b/test/autotests/components-browser/transclusion-include-from-state/test.js index e0bb7850d..3727f1dcd 100644 --- a/test/autotests/components-browser/transclusion-include-from-state/test.js +++ b/test/autotests/components-browser/transclusion-include-from-state/test.js @@ -1,29 +1,29 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - var buttonWidget = widget.getWidget('button'); - expect(buttonWidget.el.innerHTML).to.contain('Frank'); - expect(buttonWidget.el.className).to.equal('app-button app-button-small'); + var buttonComponent = component.getComponent('button'); + expect(buttonComponent.el.innerHTML).to.contain('Frank'); + expect(buttonComponent.el.className).to.equal('app-button app-button-small'); - widget.rerender({ name: 'John '}); + component.rerender({ name: 'John '}); - expect(buttonWidget.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.innerHTML).to.contain('John'); - buttonWidget.setSize('large'); - buttonWidget.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); - expect(buttonWidget.el.className).to.equal('app-button app-button-large'); + buttonComponent.setSize('large'); + buttonComponent.update(); + expect(buttonComponent.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.className).to.equal('app-button app-button-large'); - buttonWidget.rerender({ + buttonComponent.rerender({ size: 'small', variant: 'secondary' // NOTE: We aren't including renderBody() but we expect that content to be preserved }); - expect(buttonWidget.el.innerHTML).to.contain('John'); - expect(buttonWidget.el.className).to.equal('app-button app-button-secondary app-button-small'); + expect(buttonComponent.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.className).to.equal('app-button app-button-secondary app-button-small'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/transclusion-include-not-in-state/test.js b/test/autotests/components-browser/transclusion-include-not-in-state/test.js index 228920b08..8d2b3573d 100644 --- a/test/autotests/components-browser/transclusion-include-not-in-state/test.js +++ b/test/autotests/components-browser/transclusion-include-not-in-state/test.js @@ -1,21 +1,21 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank' }); - var buttonWidget = widget.getWidget('button'); - expect(buttonWidget.el.innerHTML).to.contain('Frank'); - expect(buttonWidget.el.className).to.equal('app-button app-button-small'); + var buttonComponent = component.getComponent('button'); + expect(buttonComponent.el.innerHTML).to.contain('Frank'); + expect(buttonComponent.el.className).to.equal('app-button app-button-small'); - widget.input = { name: 'John '}; - widget.update(); + component.input = { name: 'John '}; + component.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.innerHTML).to.contain('John'); - buttonWidget.setSize('large'); - buttonWidget.update(); - expect(buttonWidget.el.innerHTML).to.contain('John'); - expect(buttonWidget.el.className).to.equal('app-button app-button-large'); + buttonComponent.setSize('large'); + buttonComponent.update(); + expect(buttonComponent.el.innerHTML).to.contain('John'); + expect(buttonComponent.el.className).to.equal('app-button app-button-large'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/update-next-tick/test.js b/test/autotests/components-browser/update-next-tick/test.js index 2958c1ade..3774d258e 100644 --- a/test/autotests/components-browser/update-next-tick/test.js +++ b/test/autotests/components-browser/update-next-tick/test.js @@ -1,17 +1,17 @@ var expect = require('chai').expect; module.exports = function(helpers, done) { - var widget = helpers.mount(require('./index.marko'), { + var component = helpers.mount(require('./index.marko'), { size: 'large', label: 'Initial Label' }); - widget.onUpdate = function() { - expect(widget.el.className).to.contain('small'); + component.onUpdate = function() { + expect(component.el.className).to.contain('small'); done(); }; - expect(widget.el.className).to.contain('large'); - widget.setSize('small'); - expect(widget.el.className).to.not.contain('small'); + expect(component.el.className).to.contain('large'); + component.setSize('small'); + expect(component.el.className).to.not.contain('small'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/update-queued/test.js b/test/autotests/components-browser/update-queued/test.js index 730e00e3a..b237bab33 100644 --- a/test/autotests/components-browser/update-queued/test.js +++ b/test/autotests/components-browser/update-queued/test.js @@ -2,16 +2,16 @@ var expect = require('chai').expect; module.exports = function(helpers, done) { - var widget = helpers.mount(require('./index'), { name: 'Frank' }); + var component = helpers.mount(require('./index'), { name: 'Frank' }); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello Frank!'); - widget.setName('Jane'); + component.setName('Jane'); - expect(widget.el.innerHTML).to.contain('Hello Frank!'); + expect(component.el.innerHTML).to.contain('Hello Frank!'); - widget.onUpdate = function() { - expect(widget.el.innerHTML).to.contain('Hello Jane!'); + component.onUpdate = function() { + expect(component.el.innerHTML).to.contain('Hello Jane!'); done(); }; }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-api/test.js b/test/autotests/components-browser/widget-api/test.js index f4a441957..dfb908eae 100644 --- a/test/autotests/components-browser/widget-api/test.js +++ b/test/autotests/components-browser/widget-api/test.js @@ -1,22 +1,22 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.id).to.be.a('string'); - expect(widget.emit).to.be.a('function'); - expect(widget.on).to.be.a('function'); - expect(widget.once).to.be.a('function'); - expect(widget.subscribeTo).to.be.a('function'); - expect(widget.getElId).to.be.a('function'); - expect(widget.elId).to.be.a('function'); - expect(widget.getEl).to.be.a('function'); - expect(widget.destroy).to.be.a('function'); - expect(widget.isDestroyed).to.be.a('function'); - expect(widget.rerender).to.be.a('function'); - expect(widget.appendTo).to.be.a('function'); - expect(widget.replace).to.be.a('function'); - expect(widget.replaceChildrenOf).to.be.a('function'); - expect(widget.insertBefore).to.be.a('function'); - expect(widget.insertAfter).to.be.a('function'); - expect(widget.prependTo).to.be.a('function'); + var component = helpers.mount(require('./index'), {}); + expect(component.id).to.be.a('string'); + expect(component.emit).to.be.a('function'); + expect(component.on).to.be.a('function'); + expect(component.once).to.be.a('function'); + expect(component.subscribeTo).to.be.a('function'); + expect(component.getElId).to.be.a('function'); + expect(component.elId).to.be.a('function'); + expect(component.getEl).to.be.a('function'); + expect(component.destroy).to.be.a('function'); + expect(component.isDestroyed).to.be.a('function'); + expect(component.rerender).to.be.a('function'); + expect(component.appendTo).to.be.a('function'); + expect(component.replace).to.be.a('function'); + expect(component.replaceChildrenOf).to.be.a('function'); + expect(component.insertBefore).to.be.a('function'); + expect(component.insertAfter).to.be.a('function'); + expect(component.prependTo).to.be.a('function'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-custom-events-declarative/index.marko b/test/autotests/components-browser/widget-custom-events-declarative/index.marko index 864a20e34..6eb859b42 100644 --- a/test/autotests/components-browser/widget-custom-events-declarative/index.marko +++ b/test/autotests/components-browser/widget-custom-events-declarative/index.marko @@ -6,7 +6,7 @@ - +
    • ${color}
      • diff --git a/test/autotests/components-browser/widget-custom-events-declarative/test.js b/test/autotests/components-browser/widget-custom-events-declarative/test.js index 76a444ecf..14f4d0a76 100644 --- a/test/autotests/components-browser/widget-custom-events-declarative/test.js +++ b/test/autotests/components-browser/widget-custom-events-declarative/test.js @@ -2,35 +2,35 @@ var expect = require('chai').expect; var pubsub = require('~/util/pubsub'); module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); var received1 = []; var received2 = []; - widget.handleTestEvent1 = function() { + component.handleTestEvent1 = function() { received1.push({ args: arguments, - widget: arguments[arguments.length -1] + component: arguments[arguments.length -1] }); }; - widget.handleTestEvent2 = function() { + component.handleTestEvent2 = function() { received2.push({ args: arguments, - widget: arguments[arguments.length -1] + component: arguments[arguments.length -1] }); }; - widget.getWidget('customEvents').emitTestEvent1(); + component.getComponent('customEvents').emitTestEvent1(); expect(received1.length).to.equal(1); - expect(received1[0].args.length).to.equal(3); // ['a', 'b', sourceWidget] - expect(received1[0].widget).to.equal(widget.getWidget('customEvents')); + expect(received1[0].args.length).to.equal(3); // ['a', 'b', sourceComponent] + expect(received1[0].component).to.equal(component.getComponent('customEvents')); - pubsub.channel('customEvents-' + widget.id).emit('emitTestEvent2'); + pubsub.channel('customEvents-' + component.id).emit('emitTestEvent2'); expect(received1.length).to.equal(1); expect(received2.length).to.equal(1); - expect(received2[0].args.length).to.equal(1); // [sourceWidget] - expect(received2[0].widget).to.be.an('object'); + expect(received2[0].args.length).to.equal(1); // [sourceComponent] + expect(received2[0].component).to.be.an('object'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-custom-events-declarative/widget.js b/test/autotests/components-browser/widget-custom-events-declarative/widget.js index 1996535e3..66a687f2b 100644 --- a/test/autotests/components-browser/widget-custom-events-declarative/widget.js +++ b/test/autotests/components-browser/widget-custom-events-declarative/widget.js @@ -1,6 +1,6 @@ module.exports = { onMount: function() { this.name = 'app-foo'; - this.getWidget('bar').appendHtml('FOO'); + this.getComponent('bar').appendHtml('FOO'); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-detach/test.js b/test/autotests/components-browser/widget-destroy-detach/test.js index 6aa94b9ec..b61a62408 100644 --- a/test/autotests/components-browser/widget-destroy-detach/test.js +++ b/test/autotests/components-browser/widget-destroy-detach/test.js @@ -1,11 +1,11 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - var el = widget.el; + var component = helpers.mount(require('./index'), {}); + var el = component.el; - expect(widget.el.parentNode).to.equal(helpers.targetEl); - widget.destroy(); - expect(widget.el == null).to.equal(true); + expect(component.el.parentNode).to.equal(helpers.targetEl); + component.destroy(); + expect(component.el == null).to.equal(true); expect(el.parentNode == null).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-legacy/index.marko b/test/autotests/components-browser/widget-destroy-legacy/index.marko index 864a20e34..6eb859b42 100644 --- a/test/autotests/components-browser/widget-destroy-legacy/index.marko +++ b/test/autotests/components-browser/widget-destroy-legacy/index.marko @@ -6,7 +6,7 @@ - +
      • ${color}
        • diff --git a/test/autotests/components-browser/widget-destroy-legacy/test.js b/test/autotests/components-browser/widget-destroy-legacy/test.js index dc3352cff..3b11e8487 100644 --- a/test/autotests/components-browser/widget-destroy-legacy/test.js +++ b/test/autotests/components-browser/widget-destroy-legacy/test.js @@ -1,11 +1,11 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.getWidget('bar') == null).to.equal(false); + expect(component.getComponent('bar') == null).to.equal(false); - widget.getWidget('bar').destroy(); + component.getComponent('bar').destroy(); - expect(widget.getWidget('bar') == null).to.equal(true); + expect(component.getComponent('bar') == null).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-legacy/widget.js b/test/autotests/components-browser/widget-destroy-legacy/widget.js index 1996535e3..66a687f2b 100644 --- a/test/autotests/components-browser/widget-destroy-legacy/widget.js +++ b/test/autotests/components-browser/widget-destroy-legacy/widget.js @@ -1,6 +1,6 @@ module.exports = { onMount: function() { this.name = 'app-foo'; - this.getWidget('bar').appendHtml('FOO'); + this.getComponent('bar').appendHtml('FOO'); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-ref/component.js b/test/autotests/components-browser/widget-destroy-ref/component.js index a8982b653..e25e5bea8 100644 --- a/test/autotests/components-browser/widget-destroy-ref/component.js +++ b/test/autotests/components-browser/widget-destroy-ref/component.js @@ -1,9 +1,9 @@ module.exports = { destroyButton1: function(size) { - this.getWidget('button1').destroy(); + this.getComponent('button1').destroy(); }, getButton1: function() { - return this.getWidget('button1'); + return this.getComponent('button1'); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-ref/test.js b/test/autotests/components-browser/widget-destroy-ref/test.js index 4ba483d2d..d2395ba52 100644 --- a/test/autotests/components-browser/widget-destroy-ref/test.js +++ b/test/autotests/components-browser/widget-destroy-ref/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var button1Widget = widget.getButton1(); - expect(button1Widget != null).to.equal(true); + var button1Component = component.getButton1(); + expect(button1Component != null).to.equal(true); - widget.destroyButton1(); + component.destroyButton1(); - button1Widget = widget.getButton1(); - expect(button1Widget === undefined).to.equal(true); - expect(widget.getWidget('simple') == null).to.equal(true); + button1Component = component.getButton1(); + expect(button1Component === undefined).to.equal(true); + expect(component.getComponent('simple') == null).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/component.js b/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/component.js index a8982b653..e25e5bea8 100644 --- a/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/component.js +++ b/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/component.js @@ -1,9 +1,9 @@ module.exports = { destroyButton1: function(size) { - this.getWidget('button1').destroy(); + this.getComponent('button1').destroy(); }, getButton1: function() { - return this.getWidget('button1'); + return this.getComponent('button1'); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/test.js b/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/test.js index cc4705d09..091d41d03 100644 --- a/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/test.js +++ b/test/autotests/components-browser/widget-destroy-unsubscribe-custom-events/test.js @@ -1,19 +1,19 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - var customEventsWidget = helpers.mount(require('./components/app-custom-events'), {}); + var component = helpers.mount(require('./index'), {}); + var customEventsComponent = helpers.mount(require('./components/app-custom-events'), {}); var receivedEvents = []; - widget.subscribeTo(customEventsWidget) + component.subscribeTo(customEventsComponent) .on('testEvent', function() { receivedEvents.push(arguments); }); - customEventsWidget.emitTestEvent1(); + customEventsComponent.emitTestEvent1(); expect(receivedEvents.length).to.equal(1); - customEventsWidget.destroy(); - customEventsWidget.emitTestEvent2(); + customEventsComponent.destroy(); + customEventsComponent.emitTestEvent2(); expect(receivedEvents.length).to.equal(1); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-destroy-unsubscribe-dom-events/test.js b/test/autotests/components-browser/widget-destroy-unsubscribe-dom-events/test.js index 7c21ce417..5f4dd39ee 100644 --- a/test/autotests/components-browser/widget-destroy-unsubscribe-dom-events/test.js +++ b/test/autotests/components-browser/widget-destroy-unsubscribe-dom-events/test.js @@ -1,23 +1,23 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(Array.isArray(widget.$__domEventListenerHandles)).to.equal(true); + expect(Array.isArray(component.$__domEventListenerHandles)).to.equal(true); - var el = widget.el; - var fooLink = widget.getEl('fooLink'); + var el = component.el; + var fooLink = component.getEl('fooLink'); - widget.destroy(); + component.destroy(); - expect(widget.$__domEventListenerHandles).to.equal(null); + expect(component.$__domEventListenerHandles).to.equal(null); - // Make sure the widget is removed from the DOM tree + // Make sure the component is removed from the DOM tree expect(el.parentNode == null).to.equal(true); // Make sure there are no DOM event listeners - widget.clearLog(); + component.clearLog(); helpers.triggerMouseEvent(fooLink, 'mouseout'); - expect(widget.logOutput).to.deep.equal([]); + expect(component.logOutput).to.deep.equal([]); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js b/test/autotests/components-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js index f6c1a600a..43f3f407b 100644 --- a/test/autotests/components-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js +++ b/test/autotests/components-browser/widget-dom-event-listeners-repeated-non-bubbling/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank', count: 30 }); - var li1 = widget.getEl('foo-0'); - var li2 = widget.getEl('foo-1'); - var li3 = widget.getEl('foo-2'); + var li1 = component.getEl('foo-0'); + var li2 = component.getEl('foo-1'); + var li3 = component.getEl('foo-2'); expect(li1.innerHTML).to.equal('red'); expect(li2.innerHTML).to.equal('green'); diff --git a/test/autotests/components-browser/widget-dom-events-jquery/test.js b/test/autotests/components-browser/widget-dom-events-jquery/test.js index dcdcea441..c11e2df7a 100644 --- a/test/autotests/components-browser/widget-dom-events-jquery/test.js +++ b/test/autotests/components-browser/widget-dom-events-jquery/test.js @@ -1,11 +1,11 @@ var expect = require('chai').expect; module.exports = function(helpers, done) { - require('marko/jquery').patchWidget(window.$); + require('marko/jquery').patchComponent(window.$); try { - var widget = helpers.mount(require('./index'), {}); - var $el = widget.$(); - var $button = widget.$('#button'); + var component = helpers.mount(require('./index'), {}); + var $el = component.$(); + var $button = component.$('#button'); $el.click(function() { helpers.log('$el:click'); @@ -18,15 +18,15 @@ module.exports = function(helpers, done) { // Trigger a click event on the root element - helpers.triggerClick(widget.el); - helpers.triggerClick(widget.getEl('button')); + helpers.triggerClick(component.el); + helpers.triggerClick(component.getEl('button')); expect(helpers.logOutput).to.deep.equal([ '$el:click', '$button:click' ]); } finally { - delete require('marko/widgets/Widget').prototype.$; + delete require('marko/components/Component').prototype.$; } done(); diff --git a/test/autotests/components-browser/widget-dom-events/test.js b/test/autotests/components-browser/widget-dom-events/test.js index 5bf612798..a1f5c3e3d 100644 --- a/test/autotests/components-browser/widget-dom-events/test.js +++ b/test/autotests/components-browser/widget-dom-events/test.js @@ -1,43 +1,43 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - widget.clearLog(); + component.clearLog(); // Trigger a click event on the root element - helpers.triggerMouseEvent(widget.el, 'click'); - expect(widget.logOutput).to.deep.equal(['el:click']); + helpers.triggerMouseEvent(component.el, 'click'); + expect(component.logOutput).to.deep.equal(['el:click']); - widget.clearLog(); - helpers.triggerMouseEvent(widget.getEl('button'), 'click'); - expect(widget.logOutput).to.deep.equal(['button:click', 'el:click']); + component.clearLog(); + helpers.triggerMouseEvent(component.getEl('button'), 'click'); + expect(component.logOutput).to.deep.equal(['button:click', 'el:click']); - widget.clearLog(); - helpers.triggerMouseEvent(widget.getEl('button').firstElementChild, 'click'); - expect(widget.logOutput).to.deep.equal(['button:click', 'el:click']); + component.clearLog(); + helpers.triggerMouseEvent(component.getEl('button').firstElementChild, 'click'); + expect(component.logOutput).to.deep.equal(['button:click', 'el:click']); - widget.clearLog(); - helpers.triggerMouseEvent(widget.el, 'mousemove'); - expect(widget.logOutput).to.deep.equal(['el:mousemove']); + component.clearLog(); + helpers.triggerMouseEvent(component.el, 'mousemove'); + expect(component.logOutput).to.deep.equal(['el:mousemove']); - widget.clearLog(); - helpers.triggerMouseEvent(widget.getEl('button').firstElementChild, 'mousemove'); - expect(widget.logOutput).to.deep.equal(['button>span:mousemove', 'el:mousemove']); + component.clearLog(); + helpers.triggerMouseEvent(component.getEl('button').firstElementChild, 'mousemove'); + expect(component.logOutput).to.deep.equal(['button>span:mousemove', 'el:mousemove']); - widget.clearLog(); + component.clearLog(); helpers.triggerMouseEvent(document.getElementById('fooLink'), 'dblclick'); - expect(widget.logOutput).to.deep.equal(['#fooLink:dblclick']); + expect(component.logOutput).to.deep.equal(['#fooLink:dblclick']); - widget.clearLog(); + component.clearLog(); helpers.triggerMouseEvent(document.getElementById('fooLink'), 'mouseout'); - expect(widget.logOutput).to.deep.equal(['#fooLink:mouseout']); + expect(component.logOutput).to.deep.equal(['#fooLink:mouseout']); - widget.clearLog(); - expect(widget.getWidget('appButton').clicked).to.equal(false); - helpers.triggerMouseEvent(widget.getEl('helloWorld'), 'mousedown'); - expect(widget.logOutput).to.deep.equal(['#helloWorld:mousedown']); - expect(widget.getWidget('appButton').clicked).to.equal(true); + component.clearLog(); + expect(component.getComponent('appButton').clicked).to.equal(false); + helpers.triggerMouseEvent(component.getEl('helloWorld'), 'mousedown'); + expect(component.logOutput).to.deep.equal(['#helloWorld:mousedown']); + expect(component.getComponent('appButton').clicked).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-dom-events/widget.js b/test/autotests/components-browser/widget-dom-events/widget.js index 13ec7a1b3..706982f5d 100644 --- a/test/autotests/components-browser/widget-dom-events/widget.js +++ b/test/autotests/components-browser/widget-dom-events/widget.js @@ -1,6 +1,6 @@ var expect = require('chai').expect; -function Widget(config) { +function Component(config) { this.logOutput = []; this.name = 'app-dom-events'; @@ -18,7 +18,7 @@ function Widget(config) { this.logOutput = []; } -Widget.prototype = { +Component.prototype = { handleRootClick: function(event, el) { expect(el.getAttribute('class')).to.equal('app-dom-events'); expect(event.target.tagName.length>0).to.equal(true); @@ -53,4 +53,4 @@ Widget.prototype = { } }; -exports.Widget = Widget; \ No newline at end of file +exports.Component = Component; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-dynamic-tag-name/test.js b/test/autotests/components-browser/widget-dynamic-tag-name/test.js index e5ae5efd9..72e4a6e86 100644 --- a/test/autotests/components-browser/widget-dynamic-tag-name/test.js +++ b/test/autotests/components-browser/widget-dynamic-tag-name/test.js @@ -1,16 +1,16 @@ var expect = require('chai').expect; module.exports = function(helpers) { - function renderWidget(rootTagName) { - var widget = helpers.mount(require('./index'), { + function renderComponent(rootTagName) { + var component = helpers.mount(require('./index'), { rootTagName: rootTagName }); - return widget; + return component; } - var widgetDiv = renderWidget('div'); - var widgetSpan = renderWidget('span'); + var componentDiv = renderComponent('div'); + var componentSpan = renderComponent('span'); - expect(widgetDiv.el.nodeName).to.equal('DIV'); - expect(widgetSpan.el.nodeName).to.equal('SPAN'); + expect(componentDiv.el.nodeName).to.equal('DIV'); + expect(componentSpan.el.nodeName).to.equal('SPAN'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-event-handler-method-conditional-bubbles/test.js b/test/autotests/components-browser/widget-event-handler-method-conditional-bubbles/test.js index 3dea119f9..255919e44 100644 --- a/test/autotests/components-browser/widget-event-handler-method-conditional-bubbles/test.js +++ b/test/autotests/components-browser/widget-event-handler-method-conditional-bubbles/test.js @@ -1,17 +1,17 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - helpers.triggerClick(widget.getEl('inputWithoutHandler')); - expect(widget.clicked).to.equal(false); + helpers.triggerClick(component.getEl('inputWithoutHandler')); + expect(component.clicked).to.equal(false); - helpers.triggerClick(widget.getEl('inputWithHandler')); - expect(widget.clicked).to.equal(true); + helpers.triggerClick(component.getEl('inputWithHandler')); + expect(component.clicked).to.equal(true); - // Reset widget.clicked - widget.clicked = false; + // Reset component.clicked + component.clicked = false; - helpers.triggerClick(widget.getEl('inputWithLiteralHandler')); - expect(widget.clicked).to.equal(true); + helpers.triggerClick(component.getEl('inputWithLiteralHandler')); + expect(component.clicked).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-event-handler-method-conditional-direct/test.js b/test/autotests/components-browser/widget-event-handler-method-conditional-direct/test.js index 6abdfe350..d434729b3 100644 --- a/test/autotests/components-browser/widget-event-handler-method-conditional-direct/test.js +++ b/test/autotests/components-browser/widget-event-handler-method-conditional-direct/test.js @@ -1,17 +1,17 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - helpers.triggerMouseMove(widget.getEl('inputWithoutHandler')); - expect(widget.mouseMoved).to.equal(false); + helpers.triggerMouseMove(component.getEl('inputWithoutHandler')); + expect(component.mouseMoved).to.equal(false); - helpers.triggerMouseMove(widget.getEl('inputWithHandler')); - expect(widget.mouseMoved).to.equal(true); + helpers.triggerMouseMove(component.getEl('inputWithHandler')); + expect(component.mouseMoved).to.equal(true); - // Reset widget.mouseMoved - widget.mouseMoved = false; + // Reset component.mouseMoved + component.mouseMoved = false; - helpers.triggerMouseMove(widget.getEl('inputWithLiteralHandler')); - expect(widget.mouseMoved).to.equal(true); + helpers.triggerMouseMove(component.getEl('inputWithLiteralHandler')); + expect(component.mouseMoved).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-event-handler-method-dynamic/test.js b/test/autotests/components-browser/widget-event-handler-method-dynamic/test.js index 20baf069f..bafcb9036 100644 --- a/test/autotests/components-browser/widget-event-handler-method-dynamic/test.js +++ b/test/autotests/components-browser/widget-event-handler-method-dynamic/test.js @@ -1,15 +1,15 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.fooClicked).to.equal(false); - expect(widget.barClicked).to.equal(false); + var component = helpers.mount(require('./index'), {}); + expect(component.fooClicked).to.equal(false); + expect(component.barClicked).to.equal(false); - helpers.triggerClick(widget.getEl('foo')); - expect(widget.fooClicked).to.equal(true); - expect(widget.barClicked).to.equal(false); + helpers.triggerClick(component.getEl('foo')); + expect(component.fooClicked).to.equal(true); + expect(component.barClicked).to.equal(false); - helpers.triggerClick(widget.getEl('bar')); - expect(widget.fooClicked).to.equal(true); - expect(widget.barClicked).to.equal(true); + helpers.triggerClick(component.getEl('bar')); + expect(component.fooClicked).to.equal(true); + expect(component.barClicked).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-extends-EventEmitter/test.js b/test/autotests/components-browser/widget-extends-EventEmitter/test.js index 34f84c6d9..575707788 100644 --- a/test/autotests/components-browser/widget-extends-EventEmitter/test.js +++ b/test/autotests/components-browser/widget-extends-EventEmitter/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); var fooEvent = null; var fooEventThis = null; @@ -10,20 +10,20 @@ module.exports = function(helpers) { fooEventThis = this; } - widget.on('foo', fooListener); + component.on('foo', fooListener); - widget.emit('foo', 'a', 'b'); + component.emit('foo', 'a', 'b'); expect(fooEvent[0]).to.equal('a'); expect(fooEvent[1]).to.equal('b'); - expect(fooEventThis).to.equal(widget); + expect(fooEventThis).to.equal(component); fooEvent = null; - widget.removeListener('foo', fooListener); + component.removeListener('foo', fooListener); - widget.emit('foo', 'a', 'b'); + component.emit('foo', 'a', 'b'); expect(fooEvent).to.equal(null); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-getEl/test.js b/test/autotests/components-browser/widget-getEl/test.js index 947983674..1447448c5 100644 --- a/test/autotests/components-browser/widget-getEl/test.js +++ b/test/autotests/components-browser/widget-getEl/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.getEl('foo').className).to.equal('foo'); - expect(widget.getEl('bar').className).to.equal('bar'); - expect(widget.getEl('foo-bar').className).to.equal('foo-bar'); + var component = helpers.mount(require('./index'), {}); + expect(component.getEl('foo').className).to.equal('foo'); + expect(component.getEl('bar').className).to.equal('bar'); + expect(component.getEl('foo-bar').className).to.equal('foo-bar'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-getEls/test.js b/test/autotests/components-browser/widget-getEls/test.js index 7a20e6643..d6a2c4075 100644 --- a/test/autotests/components-browser/widget-getEls/test.js +++ b/test/autotests/components-browser/widget-getEls/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - var els = widget.getEls('colorListItems'); + var component = helpers.mount(require('./index'), {}); + var els = component.getEls('colorListItems'); expect(els.length).to.equal(3); expect(els[0].innerHTML).to.equal('red'); expect(els[1].innerHTML).to.equal('green'); diff --git a/test/autotests/components-browser/widget-getWidget/test.js b/test/autotests/components-browser/widget-getWidget/test.js index 1c8da1b20..842912471 100644 --- a/test/autotests/components-browser/widget-getWidget/test.js +++ b/test/autotests/components-browser/widget-getWidget/test.js @@ -1,6 +1,6 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.getWidget('bar').name).to.equal('app-foo'); + var component = helpers.mount(require('./index'), {}); + expect(component.getComponent('bar').name).to.equal('app-foo'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-getWidgets-multiple/test.js b/test/autotests/components-browser/widget-getWidgets-multiple/test.js index 5449c9804..e3a9e4dff 100644 --- a/test/autotests/components-browser/widget-getWidgets-multiple/test.js +++ b/test/autotests/components-browser/widget-getWidgets-multiple/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.getWidgets('bar').length).to.equal(2); - expect(widget.getWidgets('bar')[0].name).to.equal('a'); - expect(widget.getWidgets('bar')[1].name).to.equal('b'); + var component = helpers.mount(require('./index'), {}); + expect(component.getComponents('bar').length).to.equal(2); + expect(component.getComponents('bar')[0].name).to.equal('a'); + expect(component.getComponents('bar')[1].name).to.equal('b'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-getWidgets-single/test.js b/test/autotests/components-browser/widget-getWidgets-single/test.js index 24563356b..55e957c42 100644 --- a/test/autotests/components-browser/widget-getWidgets-single/test.js +++ b/test/autotests/components-browser/widget-getWidgets-single/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - expect(widget.getWidgets('bar').length).to.equal(1); - expect(widget.getWidgets('bar')[0].name).to.equal('app-foo'); + var component = helpers.mount(require('./index'), {}); + expect(component.getComponents('bar').length).to.equal(1); + expect(component.getComponents('bar')[0].name).to.equal('app-foo'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-include-ref-dynamic/index.marko b/test/autotests/components-browser/widget-include-ref-dynamic/index.marko index aaf5a9ecc..b3a9d275b 100644 --- a/test/autotests/components-browser/widget-include-ref-dynamic/index.marko +++ b/test/autotests/components-browser/widget-include-ref-dynamic/index.marko @@ -1,7 +1,7 @@ import barComponent from './components/app-bar'; -static var barWidgetRef = 'myBar'; +static var barComponentRef = 'myBar'; -
        - +
        +
        \ No newline at end of file diff --git a/test/autotests/components-browser/widget-include-ref-dynamic/test.js b/test/autotests/components-browser/widget-include-ref-dynamic/test.js index 19122cebf..db00cfe56 100644 --- a/test/autotests/components-browser/widget-include-ref-dynamic/test.js +++ b/test/autotests/components-browser/widget-include-ref-dynamic/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var barWidget = widget.getWidget('myBar'); - expect(barWidget != null).to.equal(true); - expect(barWidget.name).to.equal('app-bar'); + var barComponent = component.getComponent('myBar'); + expect(barComponent != null).to.equal(true); + expect(barComponent.name).to.equal('app-bar'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-include-ref/index.marko b/test/autotests/components-browser/widget-include-ref/index.marko index cd297af5f..f31c7b095 100644 --- a/test/autotests/components-browser/widget-include-ref/index.marko +++ b/test/autotests/components-browser/widget-include-ref/index.marko @@ -1,5 +1,5 @@ import barComponent from './components/app-bar'; -
        +
        \ No newline at end of file diff --git a/test/autotests/components-browser/widget-include-ref/test.js b/test/autotests/components-browser/widget-include-ref/test.js index ad1039667..21b9bcd77 100644 --- a/test/autotests/components-browser/widget-include-ref/test.js +++ b/test/autotests/components-browser/widget-include-ref/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var barWidget = widget.getWidget('barTest'); - expect(barWidget != null).to.equal(true); - expect(barWidget.name).to.equal('app-bar'); + var barComponent = component.getComponent('barTest'); + expect(barComponent != null).to.equal(true); + expect(barComponent.name).to.equal('app-bar'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-jQuery-proxy/test.js b/test/autotests/components-browser/widget-jQuery-proxy/test.js index 7c73fa559..6f8ca4523 100644 --- a/test/autotests/components-browser/widget-jQuery-proxy/test.js +++ b/test/autotests/components-browser/widget-jQuery-proxy/test.js @@ -1,27 +1,27 @@ var expect = require('chai').expect; module.exports = function(helpers, done) { - require('marko/jquery').patchWidget(window.$); + require('marko/jquery').patchComponent(window.$); try { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.$().attr('id')).to.equal(widget.id); - expect(widget.$().attr('class')).to.equal('app-jquery-proxy'); - expect(widget.$('#foo').html()).to.equal('foo'); - expect(widget.$('#fooText').html()).to.equal('fooText'); - expect(widget.$('#foo-text').html()).to.equal('foo-text'); - expect(widget.$('#ul li').length).to.equal(3); - expect(widget.$('button').html()).to.equal('Test Button'); - expect(widget.$('li', 'ul').length).to.equal(3); + expect(component.$().attr('id')).to.equal(component.id); + expect(component.$().attr('class')).to.equal('app-jquery-proxy'); + expect(component.$('#foo').html()).to.equal('foo'); + expect(component.$('#fooText').html()).to.equal('fooText'); + expect(component.$('#foo-text').html()).to.equal('foo-text'); + expect(component.$('#ul li').length).to.equal(3); + expect(component.$('button').html()).to.equal('Test Button'); + expect(component.$('li', 'ul').length).to.equal(3); var count = 0; - widget.$(function() { + component.$(function() { count++; done(); }); } finally { - delete require('marko/widgets/Widget').prototype.$; + delete require('marko/components/Component').prototype.$; } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-label-for/test.js b/test/autotests/components-browser/widget-label-for/test.js index 3c8360c7f..970c45fd5 100644 --- a/test/autotests/components-browser/widget-label-for/test.js +++ b/test/autotests/components-browser/widget-label-for/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - var label = widget.getEl('label'); + var component = helpers.mount(require('./index'), {}); + var label = component.getEl('label'); var forElId = label.getAttribute('for'); var inputEl = document.getElementById(forElId); diff --git a/test/autotests/components-browser/widget-no-update-attrs-dynamic/test.js b/test/autotests/components-browser/widget-no-update-attrs-dynamic/test.js index 6718e4220..16b1b163b 100644 --- a/test/autotests/components-browser/widget-no-update-attrs-dynamic/test.js +++ b/test/autotests/components-browser/widget-no-update-attrs-dynamic/test.js @@ -1,15 +1,15 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { className: 'foo' }); - var span = widget.el.querySelector('span'); + var span = component.el.querySelector('span'); expect(span.className).to.equal('foo'); - widget.setState('className', 'bar'); - widget.update(); + component.setState('className', 'bar'); + component.update(); expect(span.className).to.equal('foo'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-no-update-attrs/test.js b/test/autotests/components-browser/widget-no-update-attrs/test.js index 25b8518f4..27d85b09b 100644 --- a/test/autotests/components-browser/widget-no-update-attrs/test.js +++ b/test/autotests/components-browser/widget-no-update-attrs/test.js @@ -1,12 +1,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index')); + var component = helpers.mount(require('./index')); - var span = widget.el.querySelector('span'); + var span = component.el.querySelector('span'); expect(span.className).to.equal('test'); - widget.update(); + component.update(); expect(span.className).to.equal('test'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js b/test/autotests/components-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js index d7e70982e..9efe8839f 100644 --- a/test/autotests/components-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js +++ b/test/autotests/components-browser/widget-preserve-all-state-when-rerendered-setTimeout/test.js @@ -1,32 +1,32 @@ var expect = require('chai').expect; module.exports = function(helpers, done) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank', count: 30 }); - var targetEl = widget.el; + var targetEl = component.el; setTimeout(function(){ - widget.setState('count', 25); - widget.update(); - expect(widget.state.count).to.equal(25); + component.setState('count', 25); + component.update(); + expect(component.state.count).to.equal(25); expect(targetEl.innerHTML).to.contain('Hello Frank! You have 25 new messages.'); }, 25); setTimeout(function(){ - widget.setState('count', 50); - widget.update(); - expect(widget.state.count).to.equal(50); + component.setState('count', 50); + component.update(); + expect(component.state.count).to.equal(50); expect(targetEl.innerHTML).to.contain('Hello Frank! You have 50 new messages.'); done(); }, 50); setTimeout(function(){ - widget.setState('count', 0); - widget.update(); - expect(widget.state.count).to.equal(0); + component.setState('count', 0); + component.update(); + expect(component.state.count).to.equal(0); expect(targetEl.innerHTML).to.contain('Hello Frank! You have 0 new messages.'); }, 0); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-all-state-when-rerendered/test.js b/test/autotests/components-browser/widget-preserve-all-state-when-rerendered/test.js index 096974ff7..d780e21df 100644 --- a/test/autotests/components-browser/widget-preserve-all-state-when-rerendered/test.js +++ b/test/autotests/components-browser/widget-preserve-all-state-when-rerendered/test.js @@ -1,25 +1,25 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank', count: 30 }); - var targetEl = widget.el; + var targetEl = component.el; expect(targetEl.innerHTML).to.contain('Hello Frank! You have 30 new messages.'); expect(targetEl.innerHTML).to.contain('foo: bar'); expect(targetEl.innerHTML).to.contain('hello: world'); - expect(widget.state.name).to.equal('Frank'); - expect(widget.state.count).to.equal(30); + expect(component.state.name).to.equal('Frank'); + expect(component.state.count).to.equal(30); - widget.setState('name', 'John'); - widget.update(); + component.setState('name', 'John'); + component.update(); expect(targetEl.innerHTML).to.contain('Hello John! You have 30 new messages.'); expect(targetEl.innerHTML).to.contain('foo: bar'); expect(targetEl.innerHTML).to.contain('hello: world'); - expect(widget.state.name).to.equal('John'); - expect(widget.state.count).to.equal(30); + expect(component.state.name).to.equal('John'); + expect(component.state.count).to.equal(30); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-dom-attrs-dynamic/test.js b/test/autotests/components-browser/widget-preserve-dom-attrs-dynamic/test.js index 6718e4220..16b1b163b 100644 --- a/test/autotests/components-browser/widget-preserve-dom-attrs-dynamic/test.js +++ b/test/autotests/components-browser/widget-preserve-dom-attrs-dynamic/test.js @@ -1,15 +1,15 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { className: 'foo' }); - var span = widget.el.querySelector('span'); + var span = component.el.querySelector('span'); expect(span.className).to.equal('foo'); - widget.setState('className', 'bar'); - widget.update(); + component.setState('className', 'bar'); + component.update(); expect(span.className).to.equal('foo'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-dom-attrs/test.js b/test/autotests/components-browser/widget-preserve-dom-attrs/test.js index 9798901b0..2e45b7004 100644 --- a/test/autotests/components-browser/widget-preserve-dom-attrs/test.js +++ b/test/autotests/components-browser/widget-preserve-dom-attrs/test.js @@ -1,26 +1,26 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var helloEl = widget.getEl('hello'); + var helloEl = component.getEl('hello'); expect(helloEl.innerHTML).to.equal('Hello Joe!'); - widget.el.style.border = "1px solid red"; - widget.el.className = "foo"; + component.el.style.border = "1px solid red"; + component.el.className = "foo"; - widget.el.querySelector('a').href = "http://www.foo.com/"; + component.el.querySelector('a').href = "http://www.foo.com/"; - widget.getEl('hello2').removeAttribute('class'); + component.getEl('hello2').removeAttribute('class'); - widget.setState('name', 'Frank'); - widget.update(); + component.setState('name', 'Frank'); + component.update(); expect(helloEl.innerHTML).to.equal('Hello Frank!'); - expect(widget.getEl('hello2').getAttribute('class')).to.equal(null); + expect(component.getEl('hello2').getAttribute('class')).to.equal(null); // Make sure the preserved attributes did not change - expect(widget.el.style.border).to.equal("1px solid red"); - expect(widget.el.className).to.equal("foo"); - expect(widget.el.querySelector('a').href).to.equal("http://www.foo.com/"); + expect(component.el.style.border).to.equal("1px solid red"); + expect(component.el.className).to.equal("foo"); + expect(component.el.querySelector('a').href).to.equal("http://www.foo.com/"); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-dom-if/index.marko b/test/autotests/components-browser/widget-preserve-dom-if/index.marko index 503fdaf2e..1d1f9348d 100644 --- a/test/autotests/components-browser/widget-preserve-dom-if/index.marko +++ b/test/autotests/components-browser/widget-preserve-dom-if/index.marko @@ -4,7 +4,7 @@ ${input.renderId} - + @@ -12,7 +12,7 @@ ${input.renderId} - +

        Preserve End

        \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-dom-if/test.js b/test/autotests/components-browser/widget-preserve-dom-if/test.js index 775afd21f..b39af0dcb 100644 --- a/test/autotests/components-browser/widget-preserve-dom-if/test.js +++ b/test/autotests/components-browser/widget-preserve-dom-if/test.js @@ -1,27 +1,27 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); function getTimestamps() { return { - preserveId: widget.getEl('preserve').getAttribute('data-renderId'), - preserveIdBody: widget.getEl('preserve').innerHTML, - preserveBodyId: widget.getEl('preserveBody').getAttribute('data-renderId'), - preserveBodyIdBody: widget.getEl('preserveBody').innerHTML, - widgetId: widget.getWidget('widget').state.name, - preserveClass: widget.el.querySelector('.preserve').getAttribute('data-renderId'), - preserveClassBody: widget.el.querySelector('.preserve').innerHTML, - preserveBodyClass: widget.el.querySelector('.preserve-body').getAttribute('data-renderId'), - preserveBodyClassBody: widget.el.querySelector('.preserve-body').innerHTML, - widgetClass: require('marko/widgets').getWidgetForEl(widget.el.querySelector('.widget-no-id')).state.name + preserveId: component.getEl('preserve').getAttribute('data-renderId'), + preserveIdBody: component.getEl('preserve').innerHTML, + preserveBodyId: component.getEl('preserveBody').getAttribute('data-renderId'), + preserveBodyIdBody: component.getEl('preserveBody').innerHTML, + componentId: component.getComponent('component').state.name, + preserveClass: component.el.querySelector('.preserve').getAttribute('data-renderId'), + preserveClassBody: component.el.querySelector('.preserve').innerHTML, + preserveBodyClass: component.el.querySelector('.preserve-body').getAttribute('data-renderId'), + preserveBodyClassBody: component.el.querySelector('.preserve-body').innerHTML, + componentClass: require('marko/components').getComponentForEl(component.el.querySelector('.component-no-id')).state.name }; } var renderId = 10; - widget.rerender({ + component.rerender({ preserveCondition: true, renderId: renderId }); @@ -31,12 +31,12 @@ module.exports = function(helpers) { expect(timestamps.preserveIdBody).to.equal('0'); expect(timestamps.preserveBodyId).to.equal('10'); expect(timestamps.preserveBodyIdBody).to.equal('0'); - expect(timestamps.widgetId).to.equal('0'); + expect(timestamps.componentId).to.equal('0'); expect(timestamps.preserveClass).to.equal('0'); expect(timestamps.preserveClassBody).to.equal('0'); expect(timestamps.preserveBodyClass).to.equal('10'); expect(timestamps.preserveBodyClassBody).to.equal('0'); - expect(timestamps.widgetClass).to.equal('0'); + expect(timestamps.componentClass).to.equal('0'); // expect(newEls1.el != null).to.equal(true); // expect(newEls1.el).to.equal(origEls.el); @@ -58,7 +58,7 @@ module.exports = function(helpers) { renderId = 100; // Do not preserve - widget.rerender({ + component.rerender({ preserveCondition: false, renderId: renderId }); @@ -68,10 +68,10 @@ module.exports = function(helpers) { expect(timestamps.preserveIdBody).to.equal('100'); expect(timestamps.preserveBodyId).to.equal('100'); expect(timestamps.preserveBodyIdBody).to.equal('100'); - expect(timestamps.widgetId).to.equal('100'); + expect(timestamps.componentId).to.equal('100'); expect(timestamps.preserveClass).to.equal('100'); expect(timestamps.preserveClassBody).to.equal('100'); expect(timestamps.preserveBodyClass).to.equal('100'); expect(timestamps.preserveBodyClassBody).to.equal('100'); - expect(timestamps.widgetClass).to.equal('100'); + expect(timestamps.componentClass).to.equal('100'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-dom-repeated/test.js b/test/autotests/components-browser/widget-preserve-dom-repeated/test.js index dc7b588ec..33db593bd 100644 --- a/test/autotests/components-browser/widget-preserve-dom-repeated/test.js +++ b/test/autotests/components-browser/widget-preserve-dom-repeated/test.js @@ -1,10 +1,10 @@ module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var oldChildren = helpers.nodeListToArray(widget.el.childNodes); + var oldChildren = helpers.nodeListToArray(component.el.childNodes); - widget.rerender(); + component.rerender(); - var newChildren = widget.el.childNodes; + var newChildren = component.el.childNodes; helpers.checkChildrenMatch(oldChildren, newChildren); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-preserve-dom-root/test.js b/test/autotests/components-browser/widget-preserve-dom-root/test.js index c279d6267..617d7d278 100644 --- a/test/autotests/components-browser/widget-preserve-dom-root/test.js +++ b/test/autotests/components-browser/widget-preserve-dom-root/test.js @@ -1,18 +1,18 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank', messageCount: 30 }); - expect(widget.el.innerHTML).to.contain('Frank'); - expect(widget.el.innerHTML).to.contain('30'); + expect(component.el.innerHTML).to.contain('Frank'); + expect(component.el.innerHTML).to.contain('30'); - widget.setName('John'); - widget.update(); + component.setName('John'); + component.update(); - expect(widget.el.innerHTML).to.not.contain('John'); - expect(widget.el.innerHTML).to.contain('Frank'); - expect(widget.el.innerHTML).to.contain('30'); + expect(component.el.innerHTML).to.not.contain('John'); + expect(component.el.innerHTML).to.contain('Frank'); + expect(component.el.innerHTML).to.contain('30'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-ready/test.js b/test/autotests/components-browser/widget-ready/test.js index 9a1d65cf4..eb1af7484 100644 --- a/test/autotests/components-browser/widget-ready/test.js +++ b/test/autotests/components-browser/widget-ready/test.js @@ -1,13 +1,13 @@ module.exports = function(helpers, done) { - require('marko/ready').patchWidget(); + require('marko/ready').patchComponent(); try { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - widget.ready(function() { + component.ready(function() { done(); }); } finally { - delete require('marko/widgets/Widget').prototype.ready; + delete require('marko/components/Component').prototype.ready; } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-render-to-iframe/component.js b/test/autotests/components-browser/widget-render-to-iframe/component.js index 50979a38e..3317cad7d 100644 --- a/test/autotests/components-browser/widget-render-to-iframe/component.js +++ b/test/autotests/components-browser/widget-render-to-iframe/component.js @@ -5,7 +5,7 @@ module.exports = { var frameEl = this.getFrameEl(); return iframeContentComponent.renderSync({}) .appendTo(frameEl.contentWindow.document.body) - .getWidget(); + .getComponent(); }, getFrameEl: function() { diff --git a/test/autotests/components-browser/widget-render-to-iframe/test.js b/test/autotests/components-browser/widget-render-to-iframe/test.js index 2d8fea4f2..c9c5905d1 100644 --- a/test/autotests/components-browser/widget-render-to-iframe/test.js +++ b/test/autotests/components-browser/widget-render-to-iframe/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - expect(widget.$__document != null).to.equal(true); - expect(widget.$__document).to.equal(document); + expect(component.$__document != null).to.equal(true); + expect(component.$__document).to.equal(document); - var contentWidget = widget.renderIntoIframe(); - expect(contentWidget.$__document).to.equal(widget.getFrameEl().contentWindow.document); - expect(contentWidget.getEl('input').value).to.equal('test'); + var contentComponent = component.renderIntoIframe(); + expect(contentComponent.$__document).to.equal(component.getFrameEl().contentWindow.document); + expect(contentComponent.getEl('input').value).to.equal('test'); - expect(contentWidget.getWidget('more').getValue()).to.equal('hello'); + expect(contentComponent.getComponent('more').getValue()).to.equal('hello'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko b/test/autotests/components-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko index 3b29572e2..da363ca0b 100644 --- a/test/autotests/components-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko +++ b/test/autotests/components-browser/widget-repeated-id-widgetless/components/app-widgetless/index.marko @@ -1 +1 @@ --- [app-widgetless] \ No newline at end of file +-- [app-componentless] \ No newline at end of file diff --git a/test/autotests/components-browser/widget-repeated-id-widgetless/index.marko b/test/autotests/components-browser/widget-repeated-id-widgetless/index.marko index 3975f4a97..a10392b93 100644 --- a/test/autotests/components-browser/widget-repeated-id-widgetless/index.marko +++ b/test/autotests/components-browser/widget-repeated-id-widgetless/index.marko @@ -1,14 +1,14 @@ -import widgetlessComponent from './components/app-widgetless'; +import componentlessComponent from './components/app-componentless'; import simpleComponent from './components/app-simple'; static var components = [ - widgetlessComponent, - widgetlessComponent, + componentlessComponent, + componentlessComponent, simpleComponent ]; -
        +
        - +
        \ No newline at end of file diff --git a/test/autotests/components-browser/widget-repeated-id-widgetless/test.js b/test/autotests/components-browser/widget-repeated-id-widgetless/test.js index afe23f115..b14f1e1e6 100644 --- a/test/autotests/components-browser/widget-repeated-id-widgetless/test.js +++ b/test/autotests/components-browser/widget-repeated-id-widgetless/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - var childWidgets = widget.getWidgets('childWidget'); - expect(childWidgets.length).to.equal(1); + var component = helpers.mount(require('./index'), {}); + var childComponents = component.getComponents('childComponent'); + expect(childComponents.length).to.equal(1); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-replaceState/test.js b/test/autotests/components-browser/widget-replaceState/test.js index 1357e42af..c6f5f8ab8 100644 --- a/test/autotests/components-browser/widget-replaceState/test.js +++ b/test/autotests/components-browser/widget-replaceState/test.js @@ -15,16 +15,16 @@ module.exports = function(helpers) { } }; - var widget = helpers.mount(require('./index'), states.original); + var component = helpers.mount(require('./index'), states.original); - expect(widget.state.heading).to.equal(states.original.heading); - expect(widget.state.message).to.equal(states.original.message); - expect(widget.state.colors).to.deep.equal(states.original.colors); + expect(component.state.heading).to.equal(states.original.heading); + expect(component.state.message).to.equal(states.original.message); + expect(component.state.colors).to.deep.equal(states.original.colors); - widget.replaceState(states.new); - widget.update(); + component.replaceState(states.new); + component.update(); - expect(widget.state.heading).to.equal(states.new.heading); - expect(widget.state.message).to.equal(states.new.message); // undefined - expect(widget.state.colors).to.deep.equal(states.new.colors); + expect(component.state.heading).to.equal(states.new.heading); + expect(component.state.message).to.equal(states.new.message); // undefined + expect(component.state.colors).to.deep.equal(states.new.colors); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-rerender-init-order/test.js b/test/autotests/components-browser/widget-rerender-init-order/test.js index 80c545af3..5cc96ec70 100644 --- a/test/autotests/components-browser/widget-rerender-init-order/test.js +++ b/test/autotests/components-browser/widget-rerender-init-order/test.js @@ -3,7 +3,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { window.rerenderInitOrder = []; - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { version: 0 }); @@ -11,8 +11,8 @@ module.exports = function(helpers) { window.rerenderInitOrder = []; - widget.input = { 'version': 1}; - widget.update(); + component.input = { 'version': 1}; + component.update(); // console.log('ACTUAL ORDER: ', window.rerenderInitOrder); expect(window.rerenderInitOrder).to.deep.equal(['childA', 'childB', 'parent']); diff --git a/test/autotests/components-browser/widget-rerender-reuse-stateful/index.marko b/test/autotests/components-browser/widget-rerender-reuse-stateful/index.marko index d7dabefcb..f9d168d61 100644 --- a/test/autotests/components-browser/widget-rerender-reuse-stateful/index.marko +++ b/test/autotests/components-browser/widget-rerender-reuse-stateful/index.marko @@ -1,4 +1,4 @@ -
        +
        ${state.buttonSize} button2
        \ No newline at end of file diff --git a/test/autotests/components-browser/widget-rerender-reuse-stateful/test.js b/test/autotests/components-browser/widget-rerender-reuse-stateful/test.js index b355370e4..f8e43e12d 100644 --- a/test/autotests/components-browser/widget-rerender-reuse-stateful/test.js +++ b/test/autotests/components-browser/widget-rerender-reuse-stateful/test.js @@ -3,28 +3,28 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var oldButton1Widget = widget.getWidget('button1'); - var oldButton2Widget = widget.getEl('button2').__widget; - var oldButton1El = oldButton1Widget.el; - var oldButton2El = widget.getEl('button2'); + var oldButton1Component = component.getComponent('button1'); + var oldButton2Component = component.getEl('button2').__component; + var oldButton1El = oldButton1Component.el; + var oldButton2El = component.getEl('button2'); - expect(widget.getWidget('button1').el.className).to.contain('normal'); + expect(component.getComponent('button1').el.className).to.contain('normal'); - var self = widget; + var self = component; self.setButtonSize('small'); self.rerender(); - var newButton1El = widget.getWidget('button1').el; - var newButton2El = widget.getEl('button2'); + var newButton1El = component.getComponent('button1').el; + var newButton2El = component.getEl('button2'); - // // Both button widgets should be reused - expect(widget.getWidget('button1')).to.equal(oldButton1Widget); - expect(widget.getEl('button2').__widget).to.equal(oldButton2Widget); + // // Both button components should be reused + expect(component.getComponent('button1')).to.equal(oldButton1Component); + expect(component.getEl('button2').__component).to.equal(oldButton2Component); - expect(widget.getWidget('button1').el.className).to.contain('small'); + expect(component.getComponent('button1').el.className).to.contain('small'); // // State changed for button1 so it should have a new el diff --git a/test/autotests/components-browser/widget-rerender-stateless-new-props/test.js b/test/autotests/components-browser/widget-rerender-stateless-new-props/test.js index 1f5872450..a3db4d31e 100644 --- a/test/autotests/components-browser/widget-rerender-stateless-new-props/test.js +++ b/test/autotests/components-browser/widget-rerender-stateless-new-props/test.js @@ -3,30 +3,30 @@ var expect = require('chai').expect; module.exports = function(helpers) { var targetEl = helpers.targetEl; - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { name: 'Frank', messageCount: 10 }); expect(targetEl.innerHTML).to.contain('Hello Frank! You have 10 new messages.'); - widget.input = { + component.input = { name: 'John', messageCount: 20 }; - widget.update(); + component.update(); expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.'); - widget.input = { + component.input = { name: 'Jane', messageCount: 30 }; expect(targetEl.innerHTML).to.contain('Hello John! You have 20 new messages.'); - widget.update(); + component.update(); expect(targetEl.innerHTML).to.contain('Hello Jane! You have 30 new messages.'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-setStateDirty/test.js b/test/autotests/components-browser/widget-setStateDirty/test.js index f01b8038e..b6c341472 100644 --- a/test/autotests/components-browser/widget-setStateDirty/test.js +++ b/test/autotests/components-browser/widget-setStateDirty/test.js @@ -1,19 +1,19 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { colors: ['red', 'green', 'blue'] }); - expect(widget.el.innerHTML).to.contain('red'); - expect(widget.el.innerHTML).to.contain('green'); - expect(widget.el.innerHTML).to.contain('blue'); + expect(component.el.innerHTML).to.contain('red'); + expect(component.el.innerHTML).to.contain('green'); + expect(component.el.innerHTML).to.contain('blue'); - widget.addColor('orange'); - widget.update(); + component.addColor('orange'); + component.update(); - expect(widget.el.innerHTML).to.contain('red'); - expect(widget.el.innerHTML).to.contain('green'); - expect(widget.el.innerHTML).to.contain('blue'); - expect(widget.el.innerHTML).to.contain('orange'); + expect(component.el.innerHTML).to.contain('red'); + expect(component.el.innerHTML).to.contain('green'); + expect(component.el.innerHTML).to.contain('blue'); + expect(component.el.innerHTML).to.contain('orange'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-split-into-multiple-templates/components/app-stateful-button/component.js b/test/autotests/components-browser/widget-split-into-multiple-templates/components/app-stateful-button/component.js index 1fdf41be1..295edca04 100644 --- a/test/autotests/components-browser/widget-split-into-multiple-templates/components/app-stateful-button/component.js +++ b/test/autotests/components-browser/widget-split-into-multiple-templates/components/app-stateful-button/component.js @@ -1,6 +1,6 @@ module.exports = { handleClick: function(event) { - // Every Widget instance is also an EventEmitter instance. + // Every Component instance is also an EventEmitter instance. // We will emit a custom "click" event when a DOM click event // is triggered this.emit('click', { diff --git a/test/autotests/components-browser/widget-split-into-multiple-templates/test.js b/test/autotests/components-browser/widget-split-into-multiple-templates/test.js index 8042d4fb6..47592f8c9 100644 --- a/test/autotests/components-browser/widget-split-into-multiple-templates/test.js +++ b/test/autotests/components-browser/widget-split-into-multiple-templates/test.js @@ -1,9 +1,9 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./'), {}); - var submitButton = widget.getWidget('submitButton'); - var cancelButton = widget.getWidget('cancelButton'); + var component = helpers.mount(require('./'), {}); + var submitButton = component.getComponent('submitButton'); + var cancelButton = component.getComponent('cancelButton'); expect(submitButton != null).to.equal(true); expect(cancelButton != null).to.equal(true); diff --git a/test/autotests/components-browser/widget-stateful-copy-state-on-write/test.js b/test/autotests/components-browser/widget-stateful-copy-state-on-write/test.js index c0f4b59fb..6460c770a 100644 --- a/test/autotests/components-browser/widget-stateful-copy-state-on-write/test.js +++ b/test/autotests/components-browser/widget-stateful-copy-state-on-write/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./'), {}); + var component = helpers.mount(require('./'), {}); - var oldState = widget.state.toJSON(); - widget.setState('foo', 'bar'); + var oldState = component.state.toJSON(); + component.setState('foo', 'bar'); - expect(widget.state.toJSON()).to.not.equal(oldState); + expect(component.state.toJSON()).to.not.equal(oldState); - oldState = widget.state.toJSON(); - widget.setState('hello', 'world'); - expect(widget.state.toJSON()).to.equal(oldState); + oldState = component.state.toJSON(); + component.setState('hello', 'world'); + expect(component.state.toJSON()).to.equal(oldState); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js b/test/autotests/components-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js index 1c088ea3b..bc71836ea 100644 --- a/test/autotests/components-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js +++ b/test/autotests/components-browser/widget-stateful-no-copy-state-on-write-if-same-value/test.js @@ -1,12 +1,12 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { size: 'large', label: 'Initial Label' }); - var oldState = widget.state; - widget.setState('size', 'large'); - expect(widget.state).to.equal(oldState); + var oldState = component.state; + component.setState('size', 'large'); + expect(component.state).to.equal(oldState); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-no-rerender-if-destroyed/test.js b/test/autotests/components-browser/widget-stateful-no-rerender-if-destroyed/test.js index 454eefaf0..452b3e3d3 100644 --- a/test/autotests/components-browser/widget-stateful-no-rerender-if-destroyed/test.js +++ b/test/autotests/components-browser/widget-stateful-no-rerender-if-destroyed/test.js @@ -1,14 +1,14 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { size: 'large', label: 'Initial Label' }); - expect(widget.el.className).to.contain('large'); + expect(component.el.className).to.contain('large'); - widget.destroy(); + component.destroy(); - expect(widget.update() === undefined).to.equal(true); + expect(component.update() === undefined).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-preserve-body/test.js b/test/autotests/components-browser/widget-stateful-preserve-body/test.js index e543be2f6..c564c62d1 100644 --- a/test/autotests/components-browser/widget-stateful-preserve-body/test.js +++ b/test/autotests/components-browser/widget-stateful-preserve-body/test.js @@ -1,22 +1,22 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var button1Widget = widget.getWidget('button1'); + var button1Component = component.getComponent('button1'); - expect(button1Widget.el.innerHTML).to.contain('Initial Button Label'); - expect(button1Widget.el.className).to.contain('large'); + expect(button1Component.el.innerHTML).to.contain('Initial Button Label'); + expect(button1Component.el.className).to.contain('large'); - button1Widget.setSize('small'); - button1Widget.update(); + button1Component.setSize('small'); + button1Component.update(); - expect(button1Widget.el.innerHTML).to.contain('Initial Button Label'); - expect(button1Widget.el.className).to.contain('small'); + expect(button1Component.el.innerHTML).to.contain('Initial Button Label'); + expect(button1Component.el.className).to.contain('small'); - widget.setState('buttonLabel', 'New Button Label'); - widget.update(); + component.setState('buttonLabel', 'New Button Label'); + component.update(); - expect(button1Widget.el.innerHTML).to.contain('New Button Label'); - expect(button1Widget.el.className).to.contain('large'); // Size will revert back to large since it was not driven by state + expect(button1Component.el.innerHTML).to.contain('New Button Label'); + expect(button1Component.el.className).to.contain('large'); // Size will revert back to large since it was not driven by state }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-reuse-widgets/index.marko b/test/autotests/components-browser/widget-stateful-reuse-widgets/index.marko index d7dabefcb..f9d168d61 100644 --- a/test/autotests/components-browser/widget-stateful-reuse-widgets/index.marko +++ b/test/autotests/components-browser/widget-stateful-reuse-widgets/index.marko @@ -1,4 +1,4 @@ -
        +
        ${state.buttonSize} button2
        \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-reuse-widgets/test.js b/test/autotests/components-browser/widget-stateful-reuse-widgets/test.js index 74572baee..e3c464e45 100644 --- a/test/autotests/components-browser/widget-stateful-reuse-widgets/test.js +++ b/test/autotests/components-browser/widget-stateful-reuse-widgets/test.js @@ -1,28 +1,28 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var oldButton1Widget = widget.getWidget('button1'); - var oldButton2Widget = widget.getEl('button2').__widget; - var oldButton1El = oldButton1Widget.el; - var oldButton2El = widget.getEl('button2'); + var oldButton1Component = component.getComponent('button1'); + var oldButton2Component = component.getEl('button2').__component; + var oldButton1El = oldButton1Component.el; + var oldButton2El = component.getEl('button2'); - expect(widget.getWidget('button1').el.className).to.contain('normal'); + expect(component.getComponent('button1').el.className).to.contain('normal'); - var self = widget; + var self = component; self.setButtonSize('small'); self.update(); - var newButton1El = widget.getWidget('button1').el; - var newButton2El = widget.getEl('button2'); + var newButton1El = component.getComponent('button1').el; + var newButton2El = component.getEl('button2'); - // // Both button widgets should be reused - expect(widget.getWidget('button1')).to.equal(oldButton1Widget); - expect(widget.getEl('button2').__widget).to.equal(oldButton2Widget); + // // Both button components should be reused + expect(component.getComponent('button1')).to.equal(oldButton1Component); + expect(component.getEl('button2').__component).to.equal(oldButton2Component); - expect(widget.getWidget('button1').el.className).to.contain('small'); + expect(component.getComponent('button1').el.className).to.contain('small'); // // State changed for button1 so it should have a new el diff --git a/test/autotests/components-browser/widget-stateful-update-handler-no-match/component.js b/test/autotests/components-browser/widget-stateful-update-handler-no-match/component.js index 548f2d0b4..93ec3e048 100644 --- a/test/autotests/components-browser/widget-stateful-update-handler-no-match/component.js +++ b/test/autotests/components-browser/widget-stateful-update-handler-no-match/component.js @@ -8,7 +8,7 @@ module.exports = { }, update_buttonSize: function(newSize) { - var button1Widget = this.getWidget('button1'); - button1Widget.setSize(newSize); + var button1Component = this.getComponent('button1'); + button1Component.setSize(newSize); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-update-handler-no-match/test.js b/test/autotests/components-browser/widget-stateful-update-handler-no-match/test.js index 4de689642..8e7485f79 100644 --- a/test/autotests/components-browser/widget-stateful-update-handler-no-match/test.js +++ b/test/autotests/components-browser/widget-stateful-update-handler-no-match/test.js @@ -1,28 +1,28 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var oldEl = widget.el; + var oldEl = component.el; - var button1Widget = widget.getWidget('button1'); - var button2Widget = widget.getWidget('button2'); + var button1Component = component.getComponent('button1'); + var button2Component = component.getComponent('button2'); - expect(button1Widget.el.className).to.contain('small'); - expect(button2Widget.el.className).to.contain('small'); + expect(button1Component.el.className).to.contain('small'); + expect(button2Component.el.className).to.contain('small'); - expect(button1Widget.el.innerHTML).to.contain('Initial Label'); - expect(button2Widget.el.innerHTML).to.contain('Initial Label'); + expect(button1Component.el.innerHTML).to.contain('Initial Label'); + expect(button2Component.el.innerHTML).to.contain('Initial Label'); - widget.setState('buttonSize', 'large'); - widget.setState('buttonLabel', 'New Label'); // buttonLabel does not have an update handler - widget.update(); + component.setState('buttonSize', 'large'); + component.setState('buttonLabel', 'New Label'); // buttonLabel does not have an update handler + component.update(); - expect(button1Widget.el.className).to.contain('large'); - expect(button2Widget.el.className).to.contain('large'); + expect(button1Component.el.className).to.contain('large'); + expect(button2Component.el.className).to.contain('large'); - expect(button1Widget.el.innerHTML).to.contain('New Label'); - expect(button2Widget.el.innerHTML).to.contain('New Label'); + expect(button1Component.el.innerHTML).to.contain('New Label'); + expect(button2Component.el.innerHTML).to.contain('New Label'); - expect(widget.el).to.equal(oldEl); + expect(component.el).to.equal(oldEl); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-update-handler/component.js b/test/autotests/components-browser/widget-stateful-update-handler/component.js index a88ce9533..e1c77d7c8 100644 --- a/test/autotests/components-browser/widget-stateful-update-handler/component.js +++ b/test/autotests/components-browser/widget-stateful-update-handler/component.js @@ -7,8 +7,8 @@ module.exports = { }, update_buttonSize: function(newSize) { - var button1Widget = this.getWidget('button1'); - button1Widget.setSize(newSize); - button1Widget.update(); + var button1Component = this.getComponent('button1'); + button1Component.setSize(newSize); + button1Component.update(); } }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-update-handler/test.js b/test/autotests/components-browser/widget-stateful-update-handler/test.js index eb167c3aa..87e661b96 100644 --- a/test/autotests/components-browser/widget-stateful-update-handler/test.js +++ b/test/autotests/components-browser/widget-stateful-update-handler/test.js @@ -1,30 +1,30 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var oldEl = widget.el; + var oldEl = component.el; - var button1Widget = widget.getWidget('button1'); - var button2Widget = widget.getWidget('button2'); + var button1Component = component.getComponent('button1'); + var button2Component = component.getComponent('button2'); - expect(button1Widget.el.className).to.contain('small'); - expect(button2Widget.el.className).to.contain('small'); + expect(button1Component.el.className).to.contain('small'); + expect(button2Component.el.className).to.contain('small'); - expect(button1Widget.el.innerHTML).to.contain('Initial Label'); - expect(button2Widget.el.innerHTML).to.contain('Initial Label'); + expect(button1Component.el.innerHTML).to.contain('Initial Label'); + expect(button2Component.el.innerHTML).to.contain('Initial Label'); - widget.setState('buttonSize', 'large'); - widget.update(); + component.setState('buttonSize', 'large'); + component.update(); - expect(button1Widget).to.equal(widget.getWidget('button1')); - expect(button2Widget).to.equal(widget.getWidget('button2')); + expect(button1Component).to.equal(component.getComponent('button1')); + expect(button2Component).to.equal(component.getComponent('button2')); - expect(button1Widget.el.className).to.contain('large'); - expect(button2Widget.el.className).to.contain('small'); + expect(button1Component.el.className).to.contain('large'); + expect(button2Component.el.className).to.contain('small'); - expect(button1Widget.el.innerHTML).to.contain('Initial Label'); - expect(button2Widget.el.innerHTML).to.contain('Initial Label'); + expect(button1Component.el.innerHTML).to.contain('Initial Label'); + expect(button2Component.el.innerHTML).to.contain('Initial Label'); - expect(widget.el).to.equal(oldEl); + expect(component.el).to.equal(oldEl); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stateful-update/component.js b/test/autotests/components-browser/widget-stateful-update/component.js index 4ac8e41f7..240893a8e 100644 --- a/test/autotests/components-browser/widget-stateful-update/component.js +++ b/test/autotests/components-browser/widget-stateful-update/component.js @@ -7,7 +7,7 @@ module.exports = { }, handleClick: function(event) { - // Every Widget instance is also an EventEmitter instance. + // Every Component instance is also an EventEmitter instance. // We will emit a custom "click" event when a DOM click event // is triggered this.emit('click', { diff --git a/test/autotests/components-browser/widget-stateful-update/test.js b/test/autotests/components-browser/widget-stateful-update/test.js index 42db356c0..0ef1895ed 100644 --- a/test/autotests/components-browser/widget-stateful-update/test.js +++ b/test/autotests/components-browser/widget-stateful-update/test.js @@ -1,15 +1,15 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), { + var component = helpers.mount(require('./index'), { size: 'large', label: 'Initial Label' }); - expect(widget.el.className).to.contain('large'); + expect(component.el.className).to.contain('large'); - widget.setSize('small'); - widget.update(); + component.setSize('small'); + component.update(); - expect(widget.el.className).to.contain('small'); + expect(component.el.className).to.contain('small'); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-stopPropagation/test.js b/test/autotests/components-browser/widget-stopPropagation/test.js index ca3cf9dd6..517ca3b57 100644 --- a/test/autotests/components-browser/widget-stopPropagation/test.js +++ b/test/autotests/components-browser/widget-stopPropagation/test.js @@ -1,8 +1,8 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); - helpers.triggerClick(widget.getEl('button')); - expect(widget.divClicked).to.equal(false); - expect(widget.buttonClicked).to.equal(true); + var component = helpers.mount(require('./index'), {}); + helpers.triggerClick(component.getEl('button')); + expect(component.divClicked).to.equal(false); + expect(component.buttonClicked).to.equal(true); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-subscribeTo-destroy-subscriber/test.js b/test/autotests/components-browser/widget-subscribeTo-destroy-subscriber/test.js index b636fa46b..07760e728 100644 --- a/test/autotests/components-browser/widget-subscribeTo-destroy-subscriber/test.js +++ b/test/autotests/components-browser/widget-subscribeTo-destroy-subscriber/test.js @@ -1,30 +1,30 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget1 = helpers.mount(require('./index'), {}); - var widget2 = helpers.mount(require('./index'), {}); + var component1 = helpers.mount(require('./index'), {}); + var component2 = helpers.mount(require('./index'), {}); var fooEvent = null; var fooEventThis = null; - widget1.subscribeTo(widget2) + component1.subscribeTo(component2) .on('foo', function fooListener() { fooEvent = arguments; fooEventThis = this; }); - widget2.emit('foo', 'a', 'b'); + component2.emit('foo', 'a', 'b'); expect(fooEvent[0]).to.equal('a'); expect(fooEvent[1]).to.equal('b'); - expect(fooEventThis).to.equal(widget2); + expect(fooEventThis).to.equal(component2); fooEvent = null; - widget1.destroy(); + component1.destroy(); - widget2.emit('foo', 'a', 'b'); + component2.emit('foo', 'a', 'b'); expect(fooEvent).to.equal(null); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-subscribeTo-destroy-target/test.js b/test/autotests/components-browser/widget-subscribeTo-destroy-target/test.js index 91b1997e3..858cde3c9 100644 --- a/test/autotests/components-browser/widget-subscribeTo-destroy-target/test.js +++ b/test/autotests/components-browser/widget-subscribeTo-destroy-target/test.js @@ -1,32 +1,32 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget1 = helpers.mount(require('./index'), {}); - var widget2 = helpers.mount(require('./index'), {}); + var component1 = helpers.mount(require('./index'), {}); + var component2 = helpers.mount(require('./index'), {}); var fooEvent = null; var fooEventThis = null; - widget1.subscribeTo(widget2) + component1.subscribeTo(component2) .on('foo', function fooListener() { fooEvent = arguments; fooEventThis = this; }); - widget2.emit('foo', 'a', 'b'); + component2.emit('foo', 'a', 'b'); expect(fooEvent[0]).to.equal('a'); expect(fooEvent[1]).to.equal('b'); - expect(fooEventThis).to.equal(widget2); + expect(fooEventThis).to.equal(component2); fooEvent = null; - widget2.destroy(); + component2.destroy(); - widget2.emit('foo', 'a', 'b'); + component2.emit('foo', 'a', 'b'); expect(fooEvent).to.equal(null); }; \ No newline at end of file diff --git a/test/autotests/components-browser/widget-transclusion/test.js b/test/autotests/components-browser/widget-transclusion/test.js index 7d53cb00e..7f92126ef 100644 --- a/test/autotests/components-browser/widget-transclusion/test.js +++ b/test/autotests/components-browser/widget-transclusion/test.js @@ -1,24 +1,24 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widget = helpers.mount(require('./index'), {}); + var component = helpers.mount(require('./index'), {}); - var el = widget.el; + var el = component.el; var originalH1Html = el.querySelector('h1').innerHTML; expect(el.innerHTML).to.contain('alert alert-success'); // The inner HTML for the H1 should not change since only the body content changed - widget.setAlertMessage('Hello Universe'); - widget.update(); + component.setAlertMessage('Hello Universe'); + component.update(); expect(el.querySelector('h1').innerHTML).to.equal(originalH1Html); expect(el.querySelector('h1').innerHTML).to.contain('success'); expect(el.querySelector('.alert').className).to.contain('alert alert-success'); - // The inner HTML for the H1 should change since the state of the alert widget changed - widget.setAlertType('failure'); - widget.update(); + // The inner HTML for the H1 should change since the state of the alert component changed + component.setAlertType('failure'); + component.update(); expect(el.querySelector('h1').innerHTML).to.not.equal(originalH1Html); expect(el.querySelector('h1').innerHTML).to.contain('failure'); diff --git a/test/autotests/components-browser/widget-unique-id/test.js b/test/autotests/components-browser/widget-unique-id/test.js index 15df98ad2..4514f92ea 100644 --- a/test/autotests/components-browser/widget-unique-id/test.js +++ b/test/autotests/components-browser/widget-unique-id/test.js @@ -1,22 +1,22 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var widgets = []; + var components = []; - function renderWidget() { - var widget = helpers.mount(require('./index'), {}); - widgets.push(widget); + function renderComponent() { + var component = helpers.mount(require('./index'), {}); + components.push(component); } - renderWidget(); - renderWidget(); - renderWidget(); + renderComponent(); + renderComponent(); + renderComponent(); var ids = {}; - widgets.forEach(function(widget) { - ids[widget.id] = true; + components.forEach(function(component) { + ids[component.id] = true; }); - expect(widgets.length).to.equal(3); - expect(Object.keys(ids).length).to.equal(widgets.length); + expect(components.length).to.equal(3); + expect(Object.keys(ids).length).to.equal(components.length); }; \ No newline at end of file diff --git a/test/autotests/components-compilation-deprecated/bind-component/expected.js b/test/autotests/components-compilation-deprecated/bind-component/expected.js index fd6f419d8..372808700 100644 --- a/test/autotests/components-compilation-deprecated/bind-component/expected.js +++ b/test/autotests/components-compilation-deprecated/bind-component/expected.js @@ -1,23 +1,23 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets/legacy"), - marko_registerWidget = marko_widgets.rw, - marko_defineWidget = marko_widgets.w, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/bind-component/index", function() { - return marko_defineWidget(require("./")); + marko_components = require("marko/components/legacy"), + marko_registerComponent = marko_components.rw, + marko_defineComponent = marko_components.w, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/bind-component/index", function() { + return marko_defineComponent(require("./")); }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("
        "); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }); marko_template.meta = { @@ -28,7 +28,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/bind-widget/expected.js b/test/autotests/components-compilation-deprecated/bind-widget/expected.js index 0e9e74351..057958673 100644 --- a/test/autotests/components-compilation-deprecated/bind-widget/expected.js +++ b/test/autotests/components-compilation-deprecated/bind-widget/expected.js @@ -1,34 +1,34 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets/legacy"), - marko_registerWidget = marko_widgets.rw, - marko_defineWidget = marko_widgets.w, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/bind-widget/widget", function() { - return marko_defineWidget(require("./widget")); + marko_components = require("marko/components/legacy"), + marko_registerComponent = marko_components.rw, + marko_defineComponent = marko_components.w, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/bind-component/component", function() { + return marko_defineComponent(require("./component")); }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("
        "); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }); marko_template.meta = { deps: [ { type: "require", - path: "./widget" + path: "./component" }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/component-include-attr/expected.js b/test/autotests/components-compilation-deprecated/component-include-attr/expected.js index 0f1369367..dd2ce06b4 100644 --- a/test/autotests/components-compilation-deprecated/component-include-attr/expected.js +++ b/test/autotests/components-compilation-deprecated/component-include-attr/expected.js @@ -1,34 +1,34 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets/legacy"), - marko_registerWidget = marko_widgets.rw, - marko_defineWidget = marko_widgets.w, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-include-attr/index", function() { - return marko_defineWidget(require("./")); + marko_components = require("marko/components/legacy"), + marko_registerComponent = marko_components.rw, + marko_defineComponent = marko_components.w, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-include-attr/index", function() { + return marko_defineComponent(require("./")); }), marko_helpers = require("marko/runtime/html/helpers"), marko_loadTag = marko_helpers.t, - include_tag = marko_loadTag(require("marko/widgets/taglib/include-tag")), + include_tag = marko_loadTag(require("marko/components/taglib/include-tag")), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("

        Header

        "); include_tag({ - _target: widget.b, - _elId: widget.elId(0) + _target: component.b, + _elId: component.elId(0) }, out); out.w("
        "); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType, +marko_template._ = marko_components.r(render, { + type: marko_componentType, body: 0 }); @@ -40,10 +40,10 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ], tags: [ - "marko/widgets/taglib/include-tag" + "marko/components/taglib/include-tag" ] }; diff --git a/test/autotests/components-compilation-deprecated/component-inline-export-default/expected.js b/test/autotests/components-compilation-deprecated/component-inline-export-default/expected.js index d4d873b89..7a40f4754 100644 --- a/test/autotests/components-compilation-deprecated/component-inline-export-default/expected.js +++ b/test/autotests/components-compilation-deprecated/component-inline-export-default/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-inline-export-default/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-inline-export-default/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -9,19 +9,19 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("
"); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -31,7 +31,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/component-inline-module-exports/expected.js b/test/autotests/components-compilation-deprecated/component-inline-module-exports/expected.js index b4502f4ed..3a335f6b5 100644 --- a/test/autotests/components-compilation-deprecated/component-inline-module-exports/expected.js +++ b/test/autotests/components-compilation-deprecated/component-inline-module-exports/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-inline-module-exports/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-inline-module-exports/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -9,19 +9,19 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("
"); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -31,7 +31,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/component-inline-multiple-roots/expected.js b/test/autotests/components-compilation-deprecated/component-inline-multiple-roots/expected.js index 89b4b94df..a10906c7c 100644 --- a/test/autotests/components-compilation-deprecated/component-inline-multiple-roots/expected.js +++ b/test/autotests/components-compilation-deprecated/component-inline-multiple-roots/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-inline-multiple-roots/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-inline-multiple-roots/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -9,25 +9,25 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("AB"); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType, +marko_template._ = marko_components.r(render, { + type: marko_componentType, roots: [ "_r0", "_r1" ] }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -37,7 +37,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/component-inline-var-module-exports/expected.js b/test/autotests/components-compilation-deprecated/component-inline-var-module-exports/expected.js index 013b17b47..88398ac2e 100644 --- a/test/autotests/components-compilation-deprecated/component-inline-var-module-exports/expected.js +++ b/test/autotests/components-compilation-deprecated/component-inline-var-module-exports/expected.js @@ -1,8 +1,8 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component, - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-inline-var-module-exports/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-inline-var-module-exports/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -10,19 +10,19 @@ var marko_template = module.exports = require("marko/html").t(__filename), var foo = marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -32,7 +32,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/component-template-entry/component.js b/test/autotests/components-compilation-deprecated/component-template-entry/component.js index 1eb7cd833..a4762ce01 100644 --- a/test/autotests/components-compilation-deprecated/component-template-entry/component.js +++ b/test/autotests/components-compilation-deprecated/component-template-entry/component.js @@ -1,21 +1,21 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component = require("./component"), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-template-entry/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-template-entry/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); diff --git a/test/autotests/components-compilation-deprecated/component-template-entry/expected.js b/test/autotests/components-compilation-deprecated/component-template-entry/expected.js index 33f7b230a..b27331f61 100644 --- a/test/autotests/components-compilation-deprecated/component-template-entry/expected.js +++ b/test/autotests/components-compilation-deprecated/component-template-entry/expected.js @@ -1,26 +1,26 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component = require("./component"), - marko_widgets = require("marko/widgets/legacy"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/component-template-entry/index.marko", function() { + marko_components = require("marko/components/legacy"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-template-entry/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -30,7 +30,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation-deprecated/widget-types/expected.js b/test/autotests/components-compilation-deprecated/widget-types/expected.js index daca77771..d034d6121 100644 --- a/test/autotests/components-compilation-deprecated/widget-types/expected.js +++ b/test/autotests/components-compilation-deprecated/widget-types/expected.js @@ -1,28 +1,28 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets/legacy"), - marko_registerWidget = marko_widgets.rw, - marko_defineWidget = marko_widgets.w, - marko_widgetTypes = { - "default": marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/widget-types/widget", function() { - return marko_defineWidget(require("./widget")); + marko_components = require("marko/components/legacy"), + marko_registerComponent = marko_components.rw, + marko_defineComponent = marko_components.w, + marko_componentTypes = { + "default": marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-types/component", function() { + return marko_defineComponent(require("./component")); }), - mobile: marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation-deprecated/widget-types/widget-mobile", function() { - return marko_defineWidget(require("./widget-mobile")); + mobile: marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation-deprecated/component-types/component-mobile", function() { + return marko_defineComponent(require("./component-mobile")); }) }, marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; - widget.t(marko_widgetTypes[data.isMobile ? "default" : "mobile"]); + component.t(marko_componentTypes[data.isMobile ? "default" : "mobile"]); out.w(""); } -marko_template._ = marko_widgets.r(render, {}); +marko_template._ = marko_components.r(render, {}); marko_template.meta = {}; diff --git a/test/autotests/components-compilation-deprecated/widget-types/template.marko b/test/autotests/components-compilation-deprecated/widget-types/template.marko index 497d51e15..a7929cf12 100644 --- a/test/autotests/components-compilation-deprecated/widget-types/template.marko +++ b/test/autotests/components-compilation-deprecated/widget-types/template.marko @@ -1,4 +1,4 @@ - +
\ No newline at end of file diff --git a/test/autotests/components-compilation/bind-component/expected.js b/test/autotests/components-compilation/bind-component/expected.js index fd4ae90fb..277e236a9 100644 --- a/test/autotests/components-compilation/bind-component/expected.js +++ b/test/autotests/components-compilation/bind-component/expected.js @@ -1,26 +1,26 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component = require("./component"), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/bind-component/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/bind-component/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -30,7 +30,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/bind-widget/expected.js b/test/autotests/components-compilation/bind-widget/expected.js index e66964479..7f4a5c370 100644 --- a/test/autotests/components-compilation/bind-widget/expected.js +++ b/test/autotests/components-compilation/bind-widget/expected.js @@ -1,33 +1,33 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/bind-widget/widget", function() { - return require("./widget"); + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/bind-component/component", function() { + return require("./component"); }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }); marko_template.meta = { deps: [ { type: "require", - path: "./widget" + path: "./component" }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-include-attr/expected.js b/test/autotests/components-compilation/component-include-attr/expected.js index 1d00483f0..e172fba05 100644 --- a/test/autotests/components-compilation/component-include-attr/expected.js +++ b/test/autotests/components-compilation/component-include-attr/expected.js @@ -1,41 +1,41 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component = require("./component"), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-include-attr/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-include-attr/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_loadTag = marko_helpers.t, - include_tag = marko_loadTag(require("marko/widgets/taglib/include-tag")), + include_tag = marko_loadTag(require("marko/components/taglib/include-tag")), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("

Header

"); - var __widgetId1 = widget.elId("0[]"); + var __componentId1 = component.elId("0[]"); out.w(""); include_tag({ _target: data.renderBody, - _elId: __widgetId1 + _elId: __componentId1 }, out); out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -45,10 +45,10 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ], tags: [ - "marko/widgets/taglib/include-tag" + "marko/components/taglib/include-tag" ] }; diff --git a/test/autotests/components-compilation/component-inline-class/expected.js b/test/autotests/components-compilation/component-inline-class/expected.js index 52c57241a..a40424a78 100644 --- a/test/autotests/components-compilation/component-inline-class/expected.js +++ b/test/autotests/components-compilation/component-inline-class/expected.js @@ -3,27 +3,27 @@ var marko_template = module.exports = require("marko/html").t(__filename), foo: function() {}, bar: function() {} }, - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-inline-class/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-inline-class/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -33,7 +33,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-inline-export-default/expected.js b/test/autotests/components-compilation/component-inline-export-default/expected.js index 7716cbf33..a828ee118 100644 --- a/test/autotests/components-compilation/component-inline-export-default/expected.js +++ b/test/autotests/components-compilation/component-inline-export-default/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-inline-export-default/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-inline-export-default/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -9,19 +9,19 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -31,7 +31,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-inline-module-exports/expected.js b/test/autotests/components-compilation/component-inline-module-exports/expected.js index 6acbb2615..b0c0d5b51 100644 --- a/test/autotests/components-compilation/component-inline-module-exports/expected.js +++ b/test/autotests/components-compilation/component-inline-module-exports/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-inline-module-exports/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-inline-module-exports/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -9,19 +9,19 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -31,7 +31,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-inline-multiple-roots/expected.js b/test/autotests/components-compilation/component-inline-multiple-roots/expected.js index b6872ae09..83f7e8dc5 100644 --- a/test/autotests/components-compilation/component-inline-multiple-roots/expected.js +++ b/test/autotests/components-compilation/component-inline-multiple-roots/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-inline-multiple-roots/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-inline-multiple-roots/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -9,25 +9,25 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("AB"); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType, +marko_template._ = marko_components.r(render, { + type: marko_componentType, roots: [ "_r0", "_r1" ] }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -37,7 +37,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-inline-var-module-exports/expected.js b/test/autotests/components-compilation/component-inline-var-module-exports/expected.js index 2620c6fea..d07a141ee 100644 --- a/test/autotests/components-compilation/component-inline-var-module-exports/expected.js +++ b/test/autotests/components-compilation/component-inline-var-module-exports/expected.js @@ -1,8 +1,8 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component, - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-inline-var-module-exports/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-inline-var-module-exports/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -10,19 +10,19 @@ var marko_template = module.exports = require("marko/html").t(__filename), var foo = marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -32,7 +32,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-template-entry-split/expected.js b/test/autotests/components-compilation/component-template-entry-split/expected.js index 0b6ac83b9..14b5cad06 100644 --- a/test/autotests/components-compilation/component-template-entry-split/expected.js +++ b/test/autotests/components-compilation/component-template-entry-split/expected.js @@ -1,34 +1,34 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component = require("./renderer"), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-template-entry-split/widget", function() { - return require("./widget"); + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-template-entry-split/component", function() { + return require("./component"); }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); marko_template.meta = { deps: [ { type: "require", - path: "./widget" + path: "./component" }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-template-entry/expected.js b/test/autotests/components-compilation/component-template-entry/expected.js index 598a90ddd..1da46ca89 100644 --- a/test/autotests/components-compilation/component-template-entry/expected.js +++ b/test/autotests/components-compilation/component-template-entry/expected.js @@ -1,26 +1,26 @@ var marko_template = module.exports = require("marko/html").t(__filename), marko_component = require("./component"), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-template-entry/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-template-entry/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -30,7 +30,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/component-template-non-index/expected.js b/test/autotests/components-compilation/component-template-non-index/expected.js index bcbeaf733..65a4a318b 100644 --- a/test/autotests/components-compilation/component-template-non-index/expected.js +++ b/test/autotests/components-compilation/component-template-non-index/expected.js @@ -1,22 +1,22 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/component-template-non-index/template.component", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/component-template-non-index/template.component", function() { return require("./template.component"); }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }); marko_template.meta = { @@ -28,7 +28,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/include-input-whitespace-preserved/expected.js b/test/autotests/components-compilation/include-input-whitespace-preserved/expected.js index 6c666824e..079e1e8be 100644 --- a/test/autotests/components-compilation/include-input-whitespace-preserved/expected.js +++ b/test/autotests/components-compilation/include-input-whitespace-preserved/expected.js @@ -1,23 +1,23 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/include-input-whitespace-preserved/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/include-input-whitespace-preserved/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_loadTag = marko_helpers.t, - include_tag = marko_loadTag(require("marko/widgets/taglib/include-tag")), + include_tag = marko_loadTag(require("marko/components/taglib/include-tag")), marko_attr = marko_helpers.a; var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; - var __widgetId0 = widget.id; + var __componentId0 = component.id; out.w(""); include_tag({ @@ -25,17 +25,17 @@ function render(input, out, widget, state) { _arg: { test: 1 }, - _elId: __widgetId0 + _elId: __componentId0 }, out); out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -45,10 +45,10 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ], tags: [ - "marko/widgets/taglib/include-tag" + "marko/components/taglib/include-tag" ] }; diff --git a/test/autotests/components-compilation/include-whitespace-preserved/expected.js b/test/autotests/components-compilation/include-whitespace-preserved/expected.js index 2c904c8d4..0d5c2f883 100644 --- a/test/autotests/components-compilation/include-whitespace-preserved/expected.js +++ b/test/autotests/components-compilation/include-whitespace-preserved/expected.js @@ -1,38 +1,38 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/include-whitespace-preserved/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/include-whitespace-preserved/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), marko_loadTag = marko_helpers.t, - include_tag = marko_loadTag(require("marko/widgets/taglib/include-tag")), + include_tag = marko_loadTag(require("marko/components/taglib/include-tag")), marko_attr = marko_helpers.a; var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; - var __widgetId0 = widget.id; + var __componentId0 = component.id; out.w(""); include_tag({ _target: data.renderBody, - _elId: __widgetId0 + _elId: __componentId0 }, out); out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -42,10 +42,10 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ], tags: [ - "marko/widgets/taglib/include-tag" + "marko/components/taglib/include-tag" ] }; diff --git a/test/autotests/components-compilation/index-widget-only/expected.js b/test/autotests/components-compilation/index-widget-only/expected.js index 1bec79210..7baa4b798 100644 --- a/test/autotests/components-compilation/index-widget-only/expected.js +++ b/test/autotests/components-compilation/index-widget-only/expected.js @@ -1,33 +1,33 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/index-widget-only/widget", function() { - return require("./widget"); + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/index-component-only/component", function() { + return require("./component"); }), marko_helpers = require("marko/runtime/html/helpers"), marko_attr = marko_helpers.a; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }); marko_template.meta = { deps: [ { type: "require", - path: "./widget" + path: "./component" }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/macro-widget/expected.js b/test/autotests/components-compilation/macro-widget/expected.js index 91ba6c8fa..9977f3950 100644 --- a/test/autotests/components-compilation/macro-widget/expected.js +++ b/test/autotests/components-compilation/macro-widget/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/macro-widget/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/macro-component/index.marko", function() { return module.exports; }), marko_helpers = require("marko/runtime/html/helpers"), @@ -11,12 +11,12 @@ var marko_template = module.exports = require("marko/html").t(__filename), var marko_component = {}; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; function macro_renderButton(color, out, renderBody) { out.w("" + @@ -25,7 +25,7 @@ function render(input, out, widget, state) { } out.w(""); marko_forEach([ @@ -39,11 +39,11 @@ function render(input, out, widget, state) { out.w(""); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -53,7 +53,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ] }; diff --git a/test/autotests/components-compilation/ref/expected.js b/test/autotests/components-compilation/ref/expected.js index 558c3e3e8..fde7d585a 100644 --- a/test/autotests/components-compilation/ref/expected.js +++ b/test/autotests/components-compilation/ref/expected.js @@ -1,7 +1,7 @@ var marko_template = module.exports = require("marko/html").t(__filename), - marko_widgets = require("marko/widgets"), - marko_registerWidget = marko_widgets.rw, - marko_widgetType = marko_registerWidget("/marko-test$1.0.0/autotests/widgets-compilation/ref/index.marko", function() { + marko_components = require("marko/components"), + marko_registerComponent = marko_components.rw, + marko_componentType = marko_registerComponent("/marko-test$1.0.0/autotests/components-compilation/ref/index.marko", function() { return module.exports; }), marko_loadTemplate = require("marko/runtime/helper-loadTemplate"), @@ -16,30 +16,30 @@ var marko_component = { } }; -function render(input, out, widget, state) { +function render(input, out, component, state) { var data = input; out.w("
"); app_foo_tag({ $w: [ - widget, + component, "foo" ] }, out); out.w("eBay
"); } -marko_template._ = marko_widgets.r(render, { - type: marko_widgetType +marko_template._ = marko_components.r(render, { + type: marko_componentType }, marko_component); -marko_template.Widget = marko_widgets.w(marko_component, marko_template._); +marko_template.Component = marko_components.w(marko_component, marko_template._); marko_template.meta = { deps: [ @@ -49,7 +49,7 @@ marko_template.meta = { }, { type: "require", - path: "marko/widgets" + path: "marko/components" } ], tags: [ diff --git a/test/autotests/components-pages-deprecated/split-widget-renderer/browser.json b/test/autotests/components-pages-deprecated/split-widget-renderer/browser.json index 141f17271..8aa3317c4 100644 --- a/test/autotests/components-pages-deprecated/split-widget-renderer/browser.json +++ b/test/autotests/components-pages-deprecated/split-widget-renderer/browser.json @@ -1,5 +1,5 @@ { "dependencies": [ - "require: ./components/app-button-split/widget" + "require: ./components/app-button-split/component" ] } \ No newline at end of file diff --git a/test/autotests/components-pages/async-boundaries/browser.json b/test/autotests/components-pages/async-boundaries/browser.json index 523cd7e17..eed75cc6e 100644 --- a/test/autotests/components-pages/async-boundaries/browser.json +++ b/test/autotests/components-pages/async-boundaries/browser.json @@ -1,6 +1,6 @@ { "dependencies": [ - "require: ./components/app-hello/widget", - "require: ./components/app-init-async/widget" + "require: ./components/app-hello/component", + "require: ./components/app-init-async/component" ] } \ No newline at end of file diff --git a/test/autotests/components-pages/async-boundaries/components/app-init-async/widget.js b/test/autotests/components-pages/async-boundaries/components/app-init-async/widget.js index 7d2045913..ca6ddc3da 100644 --- a/test/autotests/components-pages/async-boundaries/components/app-init-async/widget.js +++ b/test/autotests/components-pages/async-boundaries/components/app-init-async/widget.js @@ -4,11 +4,11 @@ module.exports = { onMount: function() { window.appInitAsync = this; - var helloFrank = this.getWidget('helloFrank'); - var helloFrankAsync = this.getWidget('helloFrankAsync'); - var helloJohn = this.getWidget('helloJohn'); - var helloJohnAsync = this.getWidget('helloJohnAsync'); - var helloJane = this.getWidget('helloJane'); + var helloFrank = this.getComponent('helloFrank'); + var helloFrankAsync = this.getComponent('helloFrankAsync'); + var helloJohn = this.getComponent('helloJohn'); + var helloJohnAsync = this.getComponent('helloJohnAsync'); + var helloJane = this.getComponent('helloJane'); this.test = function() { expect(helloFrank).to.be.an('object'); diff --git a/test/autotests/components-pages/async-boundaries/template.marko b/test/autotests/components-pages/async-boundaries/template.marko index 8dd81a2db..6dc546fcb 100644 --- a/test/autotests/components-pages/async-boundaries/template.marko +++ b/test/autotests/components-pages/async-boundaries/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,7 +16,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/async-boundaries/tests.js b/test/autotests/components-pages/async-boundaries/tests.js index d2f7142be..7ce92549b 100644 --- a/test/autotests/components-pages/async-boundaries/tests.js +++ b/test/autotests/components-pages/async-boundaries/tests.js @@ -1,9 +1,9 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should initialize widgets correctly across async boundaries', function() { + it('should initialize components correctly across async boundaries', function() { window.appInitAsync.test(); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/custom-events/components/app-fancy-button/component.js b/test/autotests/components-pages/custom-events/components/app-fancy-button/component.js index 52bdb6f71..aff0776ac 100644 --- a/test/autotests/components-pages/custom-events/components/app-fancy-button/component.js +++ b/test/autotests/components-pages/custom-events/components/app-fancy-button/component.js @@ -1,5 +1,5 @@ module.exports = { emitPressEvent: function() { - this.emit('press', { widget: this }); + this.emit('press', { component: this }); } }; \ No newline at end of file diff --git a/test/autotests/components-pages/custom-events/components/app-foo/component.js b/test/autotests/components-pages/custom-events/components/app-foo/component.js index 07387fe06..899ae7dd5 100644 --- a/test/autotests/components-pages/custom-events/components/app-foo/component.js +++ b/test/autotests/components-pages/custom-events/components/app-foo/component.js @@ -1,6 +1,6 @@ module.exports = { onMount: function() { - window.fooWidget = this; + window.fooComponent = this; this.pressEvent = undefined; }, diff --git a/test/autotests/components-pages/custom-events/template.marko b/test/autotests/components-pages/custom-events/template.marko index d12bca4a4..56efe35c3 100644 --- a/test/autotests/components-pages/custom-events/template.marko +++ b/test/autotests/components-pages/custom-events/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,13 +16,13 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.afterInitWidgetsFooWidget = window.fooWidget; - window.afterInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.afterInitComponentsFooComponent = window.fooComponent; + window.afterInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/custom-events/tests.js b/test/autotests/components-pages/custom-events/tests.js index b5a6ca15e..63728f7af 100644 --- a/test/autotests/components-pages/custom-events/tests.js +++ b/test/autotests/components-pages/custom-events/tests.js @@ -4,18 +4,18 @@ var expect = require('chai').expect; describe(path.basename(__dirname), function() { it('should invoke event handler method for custom events with extra args', function() { - var widget = window.fooWidget; + var component = window.fooComponent; - widget.pressEvent = null; + component.pressEvent = null; - widget.getWidget('ok').emitPressEvent(); + component.getComponent('ok').emitPressEvent(); - expect(widget.pressEvent[0].type).to.equal('ok'); - expect(widget.pressEvent[1].widget).to.equal(widget.getWidget('ok')); + expect(component.pressEvent[0].type).to.equal('ok'); + expect(component.pressEvent[1].component).to.equal(component.getComponent('ok')); - widget.getWidget('cancel').emitPressEvent(); + component.getComponent('cancel').emitPressEvent(); - expect(widget.pressEvent[0].type).to.equal('cancel'); - expect(widget.pressEvent[1].widget).to.equal(widget.getWidget('cancel')); + expect(component.pressEvent[0].type).to.equal('cancel'); + expect(component.pressEvent[1].component).to.equal(component.getComponent('cancel')); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/dom-events-bubbling/components/no-args/index.marko b/test/autotests/components-pages/dom-events-bubbling/components/no-args/index.marko index 62301a8eb..572b791f8 100644 --- a/test/autotests/components-pages/dom-events-bubbling/components/no-args/index.marko +++ b/test/autotests/components-pages/dom-events-bubbling/components/no-args/index.marko @@ -6,8 +6,8 @@ class { } onMount() { - var widgets = window.widgets || (window.widgets = {}); - widgets['no-args'] = this; + var components = window.components || (window.components = {}); + components['no-args'] = this; } handleButtonClick() { diff --git a/test/autotests/components-pages/dom-events-bubbling/components/one-arg-array/index.marko b/test/autotests/components-pages/dom-events-bubbling/components/one-arg-array/index.marko index 465e33fb6..ebfceb32d 100644 --- a/test/autotests/components-pages/dom-events-bubbling/components/one-arg-array/index.marko +++ b/test/autotests/components-pages/dom-events-bubbling/components/one-arg-array/index.marko @@ -2,8 +2,8 @@ import { expect } from 'chai'; class { onMount() { - var widgets = window.widgets || (window.widgets = {}); - widgets['one-arg-array'] = this; + var components = window.components || (window.components = {}); + components['one-arg-array'] = this; } handleColorClick(color) { diff --git a/test/autotests/components-pages/dom-events-bubbling/components/one-arg/index.marko b/test/autotests/components-pages/dom-events-bubbling/components/one-arg/index.marko index f395463b2..83bcc6925 100644 --- a/test/autotests/components-pages/dom-events-bubbling/components/one-arg/index.marko +++ b/test/autotests/components-pages/dom-events-bubbling/components/one-arg/index.marko @@ -2,8 +2,8 @@ import { expect } from 'chai'; class { onMount() { - var widgets = window.widgets || (window.widgets = {}); - widgets['one-arg'] = this; + var components = window.components || (window.components = {}); + components['one-arg'] = this; } handleColorClick(color) { diff --git a/test/autotests/components-pages/dom-events-bubbling/components/two-args/index.marko b/test/autotests/components-pages/dom-events-bubbling/components/two-args/index.marko index e09cae8ad..7ff200628 100644 --- a/test/autotests/components-pages/dom-events-bubbling/components/two-args/index.marko +++ b/test/autotests/components-pages/dom-events-bubbling/components/two-args/index.marko @@ -2,8 +2,8 @@ import { expect } from 'chai'; class { onMount() { - var widgets = window.widgets || (window.widgets = {}); - widgets['two-args'] = this; + var components = window.components || (window.components = {}); + components['two-args'] = this; } handleColorClick(color, type) { this.color = { color: color, type: type }; diff --git a/test/autotests/components-pages/dom-events-bubbling/template.marko b/test/autotests/components-pages/dom-events-bubbling/template.marko index 6501e426d..9c94dff28 100644 --- a/test/autotests/components-pages/dom-events-bubbling/template.marko +++ b/test/autotests/components-pages/dom-events-bubbling/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -19,13 +19,13 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.afterInitWidgetsFooWidget = window.fooWidget; - window.afterInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.afterInitComponentsFooComponent = window.fooComponent; + window.afterInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/dom-events-bubbling/tests.js b/test/autotests/components-pages/dom-events-bubbling/tests.js index 8018a9b2a..19b56d284 100644 --- a/test/autotests/components-pages/dom-events-bubbling/tests.js +++ b/test/autotests/components-pages/dom-events-bubbling/tests.js @@ -24,18 +24,18 @@ var helpers = { describe(path.basename(__dirname), function() { it('should allow no args', function() { - window.widgets['no-args'].test(helpers); + window.components['no-args'].test(helpers); }); it('should allow one arg', function() { - window.widgets['one-arg'].test(helpers); + window.components['one-arg'].test(helpers); }); it('should allow one arg as array', function() { - window.widgets['one-arg-array'].test(helpers); + window.components['one-arg-array'].test(helpers); }); it('should allow two args', function() { - window.widgets['two-args'].test(helpers); + window.components['two-args'].test(helpers); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/dom-events/components/app-foo/component.js b/test/autotests/components-pages/dom-events/components/app-foo/component.js index 6394f36a3..5577f8d8a 100644 --- a/test/autotests/components-pages/dom-events/components/app-foo/component.js +++ b/test/autotests/components-pages/dom-events/components/app-foo/component.js @@ -7,7 +7,7 @@ module.exports = { }, onMount: function() { - window.fooWidget = this; + window.fooComponent = this; this.mouseMoveEvent = null; this.clickEvent = null; }, diff --git a/test/autotests/components-pages/dom-events/template.marko b/test/autotests/components-pages/dom-events/template.marko index d12bca4a4..56efe35c3 100644 --- a/test/autotests/components-pages/dom-events/template.marko +++ b/test/autotests/components-pages/dom-events/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,13 +16,13 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.afterInitWidgetsFooWidget = window.fooWidget; - window.afterInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.afterInitComponentsFooComponent = window.fooComponent; + window.afterInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/dom-events/tests.js b/test/autotests/components-pages/dom-events/tests.js index 82cf1bb6c..b3b71d4d1 100644 --- a/test/autotests/components-pages/dom-events/tests.js +++ b/test/autotests/components-pages/dom-events/tests.js @@ -20,55 +20,55 @@ function triggerClick(el) { describe(path.basename(__dirname), function() { it('should invoke event handler method for non-bubbling events', function() { - window.fooWidget.mouseMoveEvent = null; - triggerMouseEvent(window.fooWidget.getEl('button'), 'mousemove'); - expect(window.fooWidget.mouseMoveEvent != null).to.equal(true); + window.fooComponent.mouseMoveEvent = null; + triggerMouseEvent(window.fooComponent.getEl('button'), 'mousemove'); + expect(window.fooComponent.mouseMoveEvent != null).to.equal(true); - expect(window.fooWidget.mouseMoveEvent[0].type).to.equal('mousemove'); - expect(window.fooWidget.mouseMoveEvent[1]).to.equal(window.fooWidget.getEl('button')); + expect(window.fooComponent.mouseMoveEvent[0].type).to.equal('mousemove'); + expect(window.fooComponent.mouseMoveEvent[1]).to.equal(window.fooComponent.getEl('button')); }); it('should invoke event handler method for non-bubbling events with extra args', function() { - window.fooWidget.mouseMoveEvent = null; + window.fooComponent.mouseMoveEvent = null; - triggerMouseEvent(window.fooWidget.getEl('ok'), 'mousemove'); + triggerMouseEvent(window.fooComponent.getEl('ok'), 'mousemove'); - expect(window.fooWidget.mouseMoveEvent != null).to.equal(true); - expect(window.fooWidget.mouseMoveEvent[0].type).to.equal('ok'); - expect(window.fooWidget.mouseMoveEvent[1].type).to.equal('mousemove'); - expect(window.fooWidget.mouseMoveEvent[2]).to.equal(window.fooWidget.getEl('ok')); + expect(window.fooComponent.mouseMoveEvent != null).to.equal(true); + expect(window.fooComponent.mouseMoveEvent[0].type).to.equal('ok'); + expect(window.fooComponent.mouseMoveEvent[1].type).to.equal('mousemove'); + expect(window.fooComponent.mouseMoveEvent[2]).to.equal(window.fooComponent.getEl('ok')); - triggerMouseEvent(window.fooWidget.getEl('cancel'), 'mousemove'); + triggerMouseEvent(window.fooComponent.getEl('cancel'), 'mousemove'); - expect(window.fooWidget.mouseMoveEvent != null).to.equal(true); - expect(window.fooWidget.mouseMoveEvent[0].type).to.equal('cancel'); - expect(window.fooWidget.mouseMoveEvent[1].type).to.equal('mousemove'); - expect(window.fooWidget.mouseMoveEvent[2]).to.equal(window.fooWidget.getEl('cancel')); + expect(window.fooComponent.mouseMoveEvent != null).to.equal(true); + expect(window.fooComponent.mouseMoveEvent[0].type).to.equal('cancel'); + expect(window.fooComponent.mouseMoveEvent[1].type).to.equal('mousemove'); + expect(window.fooComponent.mouseMoveEvent[2]).to.equal(window.fooComponent.getEl('cancel')); }); it('should invoke event handler method for bubbling events', function() { - window.fooWidget.clickEvent = null; - triggerMouseEvent(window.fooWidget.getEl('button'), 'click'); - expect(window.fooWidget.clickEvent != null).to.equal(true); - expect(window.fooWidget.clickEvent[0].type).to.equal('click'); - expect(window.fooWidget.clickEvent[1]).to.equal(window.fooWidget.getEl('button')); + window.fooComponent.clickEvent = null; + triggerMouseEvent(window.fooComponent.getEl('button'), 'click'); + expect(window.fooComponent.clickEvent != null).to.equal(true); + expect(window.fooComponent.clickEvent[0].type).to.equal('click'); + expect(window.fooComponent.clickEvent[1]).to.equal(window.fooComponent.getEl('button')); }); it('should invoke event handler method for bubbling events with extra args', function() { - var widget = window.fooWidget; + var component = window.fooComponent; - window.fooWidget.clickEvent = null; + window.fooComponent.clickEvent = null; - triggerClick(widget.getEl('ok')); + triggerClick(component.getEl('ok')); - expect(widget.clickEvent[0].type).to.equal('ok'); - expect(widget.clickEvent[1].stopPropagation).to.be.a('function'); - expect(widget.clickEvent[2].innerHTML).to.equal('OK'); + expect(component.clickEvent[0].type).to.equal('ok'); + expect(component.clickEvent[1].stopPropagation).to.be.a('function'); + expect(component.clickEvent[2].innerHTML).to.equal('OK'); - triggerClick(widget.getEl('cancel')); + triggerClick(component.getEl('cancel')); - expect(widget.clickEvent[0].type).to.equal('cancel'); - expect(widget.clickEvent[1].stopPropagation).to.be.a('function'); - expect(widget.clickEvent[2].innerHTML).to.equal('Cancel'); + expect(component.clickEvent[0].type).to.equal('cancel'); + expect(component.clickEvent[1].stopPropagation).to.be.a('function'); + expect(component.clickEvent[2].innerHTML).to.equal('Cancel'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/getRenderedWidgets/components/app-simple/component.js b/test/autotests/components-pages/getRenderedWidgets/components/app-simple/component.js index ea940260d..d707f883a 100644 --- a/test/autotests/components-pages/getRenderedWidgets/components/app-simple/component.js +++ b/test/autotests/components-pages/getRenderedWidgets/components/app-simple/component.js @@ -1,24 +1,24 @@ if (typeof window !== 'undefined') { - window.simpleWidgets = []; + window.simpleComponents = []; } module.exports = { onInput: function(input) { - this.type = 'widget config'; + this.type = 'component config'; this.name = input.name; this.messageCount = input.messageCount; this.state = { - type: 'widget state', + type: 'component state', name: input.name, messageCount: input.messageCount }; }, onMount: function() { - window.simpleWidgets.push(this); + window.simpleComponents.push(this); - this.widgetConfig = { + this.componentConfig = { type: this.type, name: this.name, messageCount: this.messageCount diff --git a/test/autotests/components-pages/getRenderedWidgets/template.marko b/test/autotests/components-pages/getRenderedWidgets/template.marko index b7b06d33d..65b9235ac 100644 --- a/test/autotests/components-pages/getRenderedWidgets/template.marko +++ b/test/autotests/components-pages/getRenderedWidgets/template.marko @@ -1,16 +1,16 @@ script marko-init --- - var markoWidgets = require('marko/widgets'); + var markoComponents = require('marko/components'); var componentsTemplate = require('./components.marko'); function componentsDataProvider(callback) { componentsTemplate.renderToString({}, function(err, html, out) { - var widgetIds = markoWidgets.getRenderedWidgets(out); + var componentIds = markoComponents.getRenderedComponents(out); - // Serialize the HTML and the widget IDs to the browser + // Serialize the HTML and the component IDs to the browser callback(null, { html: html, - widgetIds: widgetIds + componentIds: componentIds }); }); } @@ -22,7 +22,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body await(components from componentsDataProvider) diff --git a/test/autotests/components-pages/getRenderedWidgets/tests.js b/test/autotests/components-pages/getRenderedWidgets/tests.js index 95b36273f..39b1a11af 100644 --- a/test/autotests/components-pages/getRenderedWidgets/tests.js +++ b/test/autotests/components-pages/getRenderedWidgets/tests.js @@ -1,34 +1,34 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should serialize widget config down to the browser', function() { + it('should serialize component config down to the browser', function() { - expect(window.simpleWidgets).to.equal(undefined); + expect(window.simpleComponents).to.equal(undefined); var components = window.components; var html = components.html; - var widgetIds = components.widgetIds; + var componentIds = components.componentIds; document.getElementById('testsTarget').innerHTML = html; // Add the HTML to the DOM - // Initialize the widgets to bind behavior! - markoWidgets.initWidgets(widgetIds); + // Initialize the components to bind behavior! + markoComponents.initComponents(componentIds); - expect(window.simpleWidgets.length).to.equal(2); - expect(window.simpleWidgets[0].state.type).to.equal('widget state'); - expect(window.simpleWidgets[0].state.name).to.equal('Frank'); - expect(window.simpleWidgets[0].state.messageCount).to.equal(20); - expect(window.simpleWidgets[0].widgetConfig.type).to.equal('widget config'); - expect(window.simpleWidgets[0].widgetConfig.name).to.equal('Frank'); - expect(window.simpleWidgets[0].widgetConfig.messageCount).to.equal(20); + expect(window.simpleComponents.length).to.equal(2); + expect(window.simpleComponents[0].state.type).to.equal('component state'); + expect(window.simpleComponents[0].state.name).to.equal('Frank'); + expect(window.simpleComponents[0].state.messageCount).to.equal(20); + expect(window.simpleComponents[0].componentConfig.type).to.equal('component config'); + expect(window.simpleComponents[0].componentConfig.name).to.equal('Frank'); + expect(window.simpleComponents[0].componentConfig.messageCount).to.equal(20); - expect(window.simpleWidgets[1].state.type).to.equal('widget state'); - expect(window.simpleWidgets[1].state.name).to.equal('John'); - expect(window.simpleWidgets[1].state.messageCount).to.equal(10); - expect(window.simpleWidgets[1].widgetConfig.type).to.equal('widget config'); - expect(window.simpleWidgets[1].widgetConfig.name).to.equal('John'); - expect(window.simpleWidgets[1].widgetConfig.messageCount).to.equal(10); + expect(window.simpleComponents[1].state.type).to.equal('component state'); + expect(window.simpleComponents[1].state.name).to.equal('John'); + expect(window.simpleComponents[1].state.messageCount).to.equal(10); + expect(window.simpleComponents[1].componentConfig.type).to.equal('component config'); + expect(window.simpleComponents[1].componentConfig.name).to.equal('John'); + expect(window.simpleComponents[1].componentConfig.messageCount).to.equal(10); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js b/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js index 9554c831a..ba0efe564 100644 --- a/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js +++ b/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/components/app-foo/component.js @@ -13,10 +13,10 @@ module.exports = { }; }, - onMount: function(widgetConfig) { - if (!window.fooWidgets) { - window.fooWidgets = []; + onMount: function(componentConfig) { + if (!window.fooComponents) { + window.fooComponents = []; } - window.fooWidgets.push(this); + window.fooComponents.push(this); } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/template.marko b/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/template.marko index 6ec7fb490..57531648f 100644 --- a/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/template.marko +++ b/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body diff --git a/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/tests.js b/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/tests.js index d2ba5a878..1880b16a3 100644 --- a/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/tests.js +++ b/test/autotests/components-pages/init-widgets-before-widgets-loaded-multiple-async/tests.js @@ -1,9 +1,9 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should initialize all widgets', function() { - expect(window.fooWidgets.length).to.equal(2); + it('should initialize all components', function() { + expect(window.fooComponents.length).to.equal(2); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-before-widgets-loaded/components/app-foo/component.js b/test/autotests/components-pages/init-widgets-before-widgets-loaded/components/app-foo/component.js index eccd1b5e2..81738931e 100644 --- a/test/autotests/components-pages/init-widgets-before-widgets-loaded/components/app-foo/component.js +++ b/test/autotests/components-pages/init-widgets-before-widgets-loaded/components/app-foo/component.js @@ -6,6 +6,6 @@ module.exports = { }, onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-before-widgets-loaded/template.marko b/test/autotests/components-pages/init-widgets-before-widgets-loaded/template.marko index 5682a4bcc..862b5ffd0 100644 --- a/test/autotests/components-pages/init-widgets-before-widgets-loaded/template.marko +++ b/test/autotests/components-pages/init-widgets-before-widgets-loaded/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -14,15 +14,15 @@ html lang="en" app-foo - init-widgets + init-components lasso-body script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.afterInitWidgetsFooWidget = window.fooWidget; - window.afterInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.afterInitComponentsFooComponent = window.fooComponent; + window.afterInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/init-widgets-before-widgets-loaded/tests.js b/test/autotests/components-pages/init-widgets-before-widgets-loaded/tests.js index 87ee85715..408db7acc 100644 --- a/test/autotests/components-pages/init-widgets-before-widgets-loaded/tests.js +++ b/test/autotests/components-pages/init-widgets-before-widgets-loaded/tests.js @@ -1,9 +1,9 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should serialize widget config down to the browser', function() { - expect(window.fooWidget.state.name).to.equal('app-foo'); + it('should serialize component config down to the browser', function() { + expect(window.fooComponent.state.name).to.equal('app-foo'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-bar/component.js b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-bar/component.js index 3fac1336d..8df0876aa 100644 --- a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-bar/component.js +++ b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-bar/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.barWidget = this; + window.barComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-foo/component.js b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-foo/component.js index 1b596e93d..97bd15bd1 100644 --- a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-foo/component.js +++ b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/components/app-foo/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/template.marko b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/template.marko index 7eb064634..22d94064e 100644 --- a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/template.marko +++ b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/template.marko @@ -13,7 +13,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -28,22 +28,22 @@ html lang="en" await(name from nameDataProvider) client-reorder app-bar - init-widgets + init-components script --- - // window.barWidget should not exist yet, but's store that in a variable to verify - window.afterInitWidgets_foo = window.fooWidget; - window.afterInitWidgets_bar = window.barWidget; + // window.barComponent should not exist yet, but's store that in a variable to verify + window.afterInitComponents_foo = window.fooComponent; + window.afterInitComponents_bar = window.barComponent; --- await-reorderer script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.afterReorderer_foo = window.fooWidget; - window.afterReorderer_bar = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.afterReorderer_foo = window.fooComponent; + window.afterReorderer_bar = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/tests.js b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/tests.js index adbcb7a91..f5ea8e072 100644 --- a/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/tests.js +++ b/test/autotests/components-pages/init-widgets-immediate-await-client-reorder/tests.js @@ -3,18 +3,18 @@ var expect = require('chai').expect; describe(path.basename(__dirname), function() { - it('should initialize widgets before ready', function() { + it('should initialize components before ready', function() { - expect(window.afterInitWidgets_foo != null).to.equal(true); - expect(window.afterInitWidgets_bar == null).to.equal(true); + expect(window.afterInitComponents_foo != null).to.equal(true); + expect(window.afterInitComponents_bar == null).to.equal(true); expect(window.afterReorderer_foo != null).to.equal(true); expect(window.afterReorderer_bar != null).to.equal(true); - expect(window.fooWidget != null).to.equal(true); - expect(window.barWidget != null).to.equal(true); + expect(window.fooComponent != null).to.equal(true); + expect(window.barComponent != null).to.equal(true); - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-immediate/components/app-bar/component.js b/test/autotests/components-pages/init-widgets-immediate/components/app-bar/component.js index 3fac1336d..8df0876aa 100644 --- a/test/autotests/components-pages/init-widgets-immediate/components/app-bar/component.js +++ b/test/autotests/components-pages/init-widgets-immediate/components/app-bar/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.barWidget = this; + window.barComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-immediate/components/app-baz/component.js b/test/autotests/components-pages/init-widgets-immediate/components/app-baz/component.js index e3ae80da9..03767f4bd 100644 --- a/test/autotests/components-pages/init-widgets-immediate/components/app-baz/component.js +++ b/test/autotests/components-pages/init-widgets-immediate/components/app-baz/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.bazWidget = this; + window.bazComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-immediate/components/app-foo/component.js b/test/autotests/components-pages/init-widgets-immediate/components/app-foo/component.js index 1e80bdab1..f8f03710b 100644 --- a/test/autotests/components-pages/init-widgets-immediate/components/app-foo/component.js +++ b/test/autotests/components-pages/init-widgets-immediate/components/app-foo/component.js @@ -9,8 +9,8 @@ module.exports = { }, onMount: function() { - window.fooWidget = this; - this.widgetConfig = { + window.fooComponent = this; + this.componentConfig = { type: this.type, name: this.name }; diff --git a/test/autotests/components-pages/init-widgets-immediate/template.marko b/test/autotests/components-pages/init-widgets-immediate/template.marko index c69c3e470..b6b2a2ad7 100644 --- a/test/autotests/components-pages/init-widgets-immediate/template.marko +++ b/test/autotests/components-pages/init-widgets-immediate/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -17,13 +17,13 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate script --- - // window.fooWidget should, but's store that in a variable to verify - window.afterInitWidgetsFooWidget = window.fooWidget; - window.afterInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should, but's store that in a variable to verify + window.afterInitComponentsFooComponent = window.fooComponent; + window.afterInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/init-widgets-immediate/tests.js b/test/autotests/components-pages/init-widgets-immediate/tests.js index 58b103090..5595af8e1 100644 --- a/test/autotests/components-pages/init-widgets-immediate/tests.js +++ b/test/autotests/components-pages/init-widgets-immediate/tests.js @@ -1,41 +1,41 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should initialize widgets before ready', function() { + it('should initialize components before ready', function() { - expect(window.afterInitWidgetsFooWidget != null).to.equal(true); - expect(window.afterInitWidgetsBarWidget != null).to.equal(true); + expect(window.afterInitComponentsFooComponent != null).to.equal(true); + expect(window.afterInitComponentsBarComponent != null).to.equal(true); - expect(window.fooWidget != null).to.equal(true); - expect(window.barWidget != null).to.equal(true); + expect(window.fooComponent != null).to.equal(true); + expect(window.barComponent != null).to.equal(true); - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); - expect(window.fooWidget.id).to.not.equal(window.barWidget.id); + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); + expect(window.fooComponent.id).to.not.equal(window.barComponent.id); }); - it('should assign unique IDs to each widget', function() { - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); - expect(window.bazWidget.id).to.be.a('string'); - expect(window.fooWidget.id).to.not.equal(window.barWidget.id); - expect(window.fooWidget.id).to.not.equal(window.bazWidget.id); - expect(window.bazWidget.id).to.contain(window.fooWidget.id); + it('should assign unique IDs to each component', function() { + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); + expect(window.bazComponent.id).to.be.a('string'); + expect(window.fooComponent.id).to.not.equal(window.barComponent.id); + expect(window.fooComponent.id).to.not.equal(window.bazComponent.id); + expect(window.bazComponent.id).to.contain(window.fooComponent.id); }); - it('should assign a unique ID to a nested widget based on the parent ID', function() { - expect(window.bazWidget.id).to.contain(window.fooWidget.id + '-'); + it('should assign a unique ID to a nested component based on the parent ID', function() { + expect(window.bazComponent.id).to.contain(window.fooComponent.id + '-'); }); it('should serialize state correctly', function() { - expect(window.fooWidget.state.type).to.equal('state'); - expect(window.fooWidget.state.name).to.equal('foo'); + expect(window.fooComponent.state.type).to.equal('state'); + expect(window.fooComponent.state.name).to.equal('foo'); }); - it('should serialize widget config correctly', function() { - expect(window.fooWidget.widgetConfig.type).to.equal('config'); - expect(window.fooWidget.widgetConfig.name).to.equal('foo'); + it('should serialize component config correctly', function() { + expect(window.fooComponent.componentConfig.type).to.equal('config'); + expect(window.fooComponent.componentConfig.name).to.equal('foo'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag-none/components/app-bar/component.js b/test/autotests/components-pages/init-widgets-tag-none/components/app-bar/component.js index 3fac1336d..8df0876aa 100644 --- a/test/autotests/components-pages/init-widgets-tag-none/components/app-bar/component.js +++ b/test/autotests/components-pages/init-widgets-tag-none/components/app-bar/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.barWidget = this; + window.barComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag-none/components/app-baz/component.js b/test/autotests/components-pages/init-widgets-tag-none/components/app-baz/component.js index e3ae80da9..03767f4bd 100644 --- a/test/autotests/components-pages/init-widgets-tag-none/components/app-baz/component.js +++ b/test/autotests/components-pages/init-widgets-tag-none/components/app-baz/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.bazWidget = this; + window.bazComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag-none/components/app-foo/component.js b/test/autotests/components-pages/init-widgets-tag-none/components/app-foo/component.js index 1b596e93d..97bd15bd1 100644 --- a/test/autotests/components-pages/init-widgets-tag-none/components/app-foo/component.js +++ b/test/autotests/components-pages/init-widgets-tag-none/components/app-foo/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag-none/template.marko b/test/autotests/components-pages/init-widgets-tag-none/template.marko index 948cd55f1..4f7248531 100644 --- a/test/autotests/components-pages/init-widgets-tag-none/template.marko +++ b/test/autotests/components-pages/init-widgets-tag-none/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -19,9 +19,9 @@ html lang="en" script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.beforeInitWidgetsFooWidget = window.fooWidget; - window.beforeInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.beforeInitComponentsFooComponent = window.fooComponent; + window.beforeInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/init-widgets-tag-none/tests.js b/test/autotests/components-pages/init-widgets-tag-none/tests.js index 94ebe004a..fa688591c 100644 --- a/test/autotests/components-pages/init-widgets-tag-none/tests.js +++ b/test/autotests/components-pages/init-widgets-tag-none/tests.js @@ -1,34 +1,34 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should initialize widgets after ready', function(done) { + it('should initialize components after ready', function(done) { - expect(window.beforeInitWidgetsFooWidget).to.equal(undefined); - expect(window.afterInitWidgetsBarWidget).to.equal(undefined); + expect(window.beforeInitComponentsFooComponent).to.equal(undefined); + expect(window.afterInitComponentsBarComponent).to.equal(undefined); - expect(window.fooWidget != null).to.equal(true); - expect(window.barWidget != null).to.equal(true); + expect(window.fooComponent != null).to.equal(true); + expect(window.barComponent != null).to.equal(true); - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); - expect(window.fooWidget.id).to.not.equal(window.barWidget.id); + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); + expect(window.fooComponent.id).to.not.equal(window.barComponent.id); done(); }); - it('should assign unique IDs to each widget', function(done) { - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); - expect(window.bazWidget.id).to.be.a('string'); - expect(window.fooWidget.id).to.not.equal(window.barWidget.id); - expect(window.fooWidget.id).to.not.equal(window.bazWidget.id); - expect(window.bazWidget.id).to.contain(window.fooWidget.id); + it('should assign unique IDs to each component', function(done) { + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); + expect(window.bazComponent.id).to.be.a('string'); + expect(window.fooComponent.id).to.not.equal(window.barComponent.id); + expect(window.fooComponent.id).to.not.equal(window.bazComponent.id); + expect(window.bazComponent.id).to.contain(window.fooComponent.id); done(); }); - it('should assign a unique ID to a nested widget based on the parent ID', function(done) { - expect(window.bazWidget.id).to.contain(window.fooWidget.id + '-'); + it('should assign a unique ID to a nested component based on the parent ID', function(done) { + expect(window.bazComponent.id).to.contain(window.fooComponent.id + '-'); done(); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag/components/app-bar/component.js b/test/autotests/components-pages/init-widgets-tag/components/app-bar/component.js index 3fac1336d..8df0876aa 100644 --- a/test/autotests/components-pages/init-widgets-tag/components/app-bar/component.js +++ b/test/autotests/components-pages/init-widgets-tag/components/app-bar/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.barWidget = this; + window.barComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag/components/app-baz/component.js b/test/autotests/components-pages/init-widgets-tag/components/app-baz/component.js index e3ae80da9..03767f4bd 100644 --- a/test/autotests/components-pages/init-widgets-tag/components/app-baz/component.js +++ b/test/autotests/components-pages/init-widgets-tag/components/app-baz/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.bazWidget = this; + window.bazComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag/components/app-foo/component.js b/test/autotests/components-pages/init-widgets-tag/components/app-foo/component.js index 1b596e93d..97bd15bd1 100644 --- a/test/autotests/components-pages/init-widgets-tag/components/app-foo/component.js +++ b/test/autotests/components-pages/init-widgets-tag/components/app-foo/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/init-widgets-tag/template.marko b/test/autotests/components-pages/init-widgets-tag/template.marko index 832ee3dc2..958d35989 100644 --- a/test/autotests/components-pages/init-widgets-tag/template.marko +++ b/test/autotests/components-pages/init-widgets-tag/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -19,12 +19,12 @@ html lang="en" script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.beforeInitWidgetsFooWidget = window.fooWidget; - window.beforeInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.beforeInitComponentsFooComponent = window.fooComponent; + window.beforeInitComponentsBarComponent = window.barComponent; --- - init-widgets + init-components lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/init-widgets-tag/tests.js b/test/autotests/components-pages/init-widgets-tag/tests.js index 94ebe004a..fa688591c 100644 --- a/test/autotests/components-pages/init-widgets-tag/tests.js +++ b/test/autotests/components-pages/init-widgets-tag/tests.js @@ -1,34 +1,34 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should initialize widgets after ready', function(done) { + it('should initialize components after ready', function(done) { - expect(window.beforeInitWidgetsFooWidget).to.equal(undefined); - expect(window.afterInitWidgetsBarWidget).to.equal(undefined); + expect(window.beforeInitComponentsFooComponent).to.equal(undefined); + expect(window.afterInitComponentsBarComponent).to.equal(undefined); - expect(window.fooWidget != null).to.equal(true); - expect(window.barWidget != null).to.equal(true); + expect(window.fooComponent != null).to.equal(true); + expect(window.barComponent != null).to.equal(true); - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); - expect(window.fooWidget.id).to.not.equal(window.barWidget.id); + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); + expect(window.fooComponent.id).to.not.equal(window.barComponent.id); done(); }); - it('should assign unique IDs to each widget', function(done) { - expect(window.fooWidget.id).to.be.a('string'); - expect(window.barWidget.id).to.be.a('string'); - expect(window.bazWidget.id).to.be.a('string'); - expect(window.fooWidget.id).to.not.equal(window.barWidget.id); - expect(window.fooWidget.id).to.not.equal(window.bazWidget.id); - expect(window.bazWidget.id).to.contain(window.fooWidget.id); + it('should assign unique IDs to each component', function(done) { + expect(window.fooComponent.id).to.be.a('string'); + expect(window.barComponent.id).to.be.a('string'); + expect(window.bazComponent.id).to.be.a('string'); + expect(window.fooComponent.id).to.not.equal(window.barComponent.id); + expect(window.fooComponent.id).to.not.equal(window.bazComponent.id); + expect(window.bazComponent.id).to.contain(window.fooComponent.id); done(); }); - it('should assign a unique ID to a nested widget based on the parent ID', function(done) { - expect(window.bazWidget.id).to.contain(window.fooWidget.id + '-'); + it('should assign a unique ID to a nested component based on the parent ID', function(done) { + expect(window.bazComponent.id).to.contain(window.fooComponent.id + '-'); done(); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js index d722e7637..158131377 100644 --- a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js +++ b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class-ctor/component.js @@ -37,8 +37,8 @@ Component.prototype = { }, onMount: function() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['lifecycle-events-component-class-ctor'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['lifecycle-events-component-class-ctor'] = this; }, test: function() { diff --git a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class/component.js b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class/component.js index f5418ba27..505637664 100644 --- a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class/component.js +++ b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-class/component.js @@ -41,8 +41,8 @@ Component.prototype = { }, onMount: function() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['lifecycle-events-component-class'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['lifecycle-events-component-class'] = this; }, test: function() { diff --git a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-object/component.js b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-object/component.js index a68c744cc..94e802afc 100644 --- a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-object/component.js +++ b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events-component-object/component.js @@ -37,8 +37,8 @@ module.exports = { }, onMount: function() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['lifecycle-events-component-object'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['lifecycle-events-component-object'] = this; }, test: function() { diff --git a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events/index.marko b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events/index.marko index 5ebe3f2d6..b165280a9 100644 --- a/test/autotests/components-pages/lifecycle-events/components/lifecycle-events/index.marko +++ b/test/autotests/components-pages/lifecycle-events/components/lifecycle-events/index.marko @@ -37,8 +37,8 @@ class { } onMount() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['lifecycle-events'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['lifecycle-events'] = this; } test() { diff --git a/test/autotests/components-pages/lifecycle-events/template.marko b/test/autotests/components-pages/lifecycle-events/template.marko index 76c5c0d48..c383daa3a 100644 --- a/test/autotests/components-pages/lifecycle-events/template.marko +++ b/test/autotests/components-pages/lifecycle-events/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -21,7 +21,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/lifecycle-events/tests.js b/test/autotests/components-pages/lifecycle-events/tests.js index abc7ddb77..ed095672d 100644 --- a/test/autotests/components-pages/lifecycle-events/tests.js +++ b/test/autotests/components-pages/lifecycle-events/tests.js @@ -2,22 +2,22 @@ var path = require('path'); describe(path.basename(__dirname), function() { it('should invoke lifecycle events correctly when a UI component is rendered on the server', function() { - var widget = window.widgets['lifecycle-events']; - widget.test(); + var component = window.components['lifecycle-events']; + component.test(); }); it('should invoke lifecycle events correctly when a UI component is rendered on the server - component exports class', function() { - var widget = window.widgets['lifecycle-events-component-class']; - widget.test(); + var component = window.components['lifecycle-events-component-class']; + component.test(); }); it('should invoke lifecycle events correctly when a UI component is rendered on the server - component exports class ctor', function() { - var widget = window.widgets['lifecycle-events-component-class-ctor']; - widget.test(); + var component = window.components['lifecycle-events-component-class-ctor']; + component.test(); }); it('should invoke lifecycle events correctly when a UI component is rendered on the server - component exports object', function() { - var widget = window.widgets['lifecycle-events-component-object']; - widget.test(); + var component = window.components['lifecycle-events-component-object']; + component.test(); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/onInput/components/onInput-assign-null-and-return/index.marko b/test/autotests/components-pages/onInput/components/onInput-assign-null-and-return/index.marko index 7ccdbd8f5..42315fdbb 100644 --- a/test/autotests/components-pages/onInput/components/onInput-assign-null-and-return/index.marko +++ b/test/autotests/components-pages/onInput/components/onInput-assign-null-and-return/index.marko @@ -8,8 +8,8 @@ class { } onMount() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['onInput-assign-null-and-return'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['onInput-assign-null-and-return'] = this; } } diff --git a/test/autotests/components-pages/onInput/components/onInput-assign-null/index.marko b/test/autotests/components-pages/onInput/components/onInput-assign-null/index.marko index b3a0ab78c..4aef8bc98 100644 --- a/test/autotests/components-pages/onInput/components/onInput-assign-null/index.marko +++ b/test/autotests/components-pages/onInput/components/onInput-assign-null/index.marko @@ -4,8 +4,8 @@ class { } onMount() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['onInput-assign-null'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['onInput-assign-null'] = this; } } diff --git a/test/autotests/components-pages/onInput/components/onInput-assign-object-and-return/index.marko b/test/autotests/components-pages/onInput/components/onInput-assign-object-and-return/index.marko index 54188bd26..bcc818918 100644 --- a/test/autotests/components-pages/onInput/components/onInput-assign-object-and-return/index.marko +++ b/test/autotests/components-pages/onInput/components/onInput-assign-object-and-return/index.marko @@ -10,8 +10,8 @@ class { } onMount() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['onInput-assign-object-and-return'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['onInput-assign-object-and-return'] = this; } } diff --git a/test/autotests/components-pages/onInput/components/onInput-assign-object/index.marko b/test/autotests/components-pages/onInput/components/onInput-assign-object/index.marko index ddcbedd20..0cbc29c6d 100644 --- a/test/autotests/components-pages/onInput/components/onInput-assign-object/index.marko +++ b/test/autotests/components-pages/onInput/components/onInput-assign-object/index.marko @@ -6,8 +6,8 @@ class { } onMount() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['onInput-assign-object'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['onInput-assign-object'] = this; } } diff --git a/test/autotests/components-pages/onInput/components/onInput-return/index.marko b/test/autotests/components-pages/onInput/components/onInput-return/index.marko index d3a95aebd..bc82ee42f 100644 --- a/test/autotests/components-pages/onInput/components/onInput-return/index.marko +++ b/test/autotests/components-pages/onInput/components/onInput-return/index.marko @@ -6,8 +6,8 @@ class { } onMount() { - var widgetsLookup = window.widgets || (window.widgets = {}); - widgetsLookup['onInput-return'] = this; + var componentsLookup = window.components || (window.components = {}); + componentsLookup['onInput-return'] = this; } } diff --git a/test/autotests/components-pages/onInput/template.marko b/test/autotests/components-pages/onInput/template.marko index 47ad51a8c..31c3ad383 100644 --- a/test/autotests/components-pages/onInput/template.marko +++ b/test/autotests/components-pages/onInput/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -20,7 +20,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/onInput/tests.js b/test/autotests/components-pages/onInput/tests.js index 42c60128d..e2ee54b1f 100644 --- a/test/autotests/components-pages/onInput/tests.js +++ b/test/autotests/components-pages/onInput/tests.js @@ -3,118 +3,118 @@ var expect = require('chai').expect; describe(path.basename(__dirname), function() { it('should allow return', function() { - var widget = window.widgets['onInput-return']; + var component = window.components['onInput-return']; - expect(widget.input.name).to.equal('FRANK'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('FRANK'); + expect(component.input.name).to.equal('FRANK'); + expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK'); - widget.input = { + component.input = { name: 'John' }; - widget.update(); + component.update(); - expect(widget.input.name).to.equal('JOHN'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('JOHN'); + expect(component.input.name).to.equal('JOHN'); + expect(component.el.querySelector('.name').innerHTML).to.equal('JOHN'); }); it('should allow input to be assigned to null', function() { - var widget = window.widgets['onInput-assign-null']; + var component = window.components['onInput-assign-null']; - expect(widget.input).to.equal(null); - expect(widget.el.querySelector('.name').innerHTML).to.equal('John'); + expect(component.input).to.equal(null); + expect(component.el.querySelector('.name').innerHTML).to.equal('John'); - widget.input = { + component.input = { name: 'Jane' }; - widget.update(); + component.update(); - expect(widget.input).to.equal(null); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Jane'); + expect(component.input).to.equal(null); + expect(component.el.querySelector('.name').innerHTML).to.equal('Jane'); - widget.input = { + component.input = { name: 'Henry' }; - widget.update(); + component.update(); - expect(widget.input).to.equal(null); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Henry'); + expect(component.input).to.equal(null); + expect(component.el.querySelector('.name').innerHTML).to.equal('Henry'); }); it('should allow input to be assigned to null with return', function() { - var widget = window.widgets['onInput-assign-null-and-return']; + var component = window.components['onInput-assign-null-and-return']; - expect(widget.input).to.equal(null); - expect(widget.el.querySelector('.name').innerHTML).to.equal('JANE'); + expect(component.input).to.equal(null); + expect(component.el.querySelector('.name').innerHTML).to.equal('JANE'); - widget.input = { + component.input = { name: 'Frank' }; - widget.update(); + component.update(); - expect(widget.input).to.equal(null); - expect(widget.el.querySelector('.name').innerHTML).to.equal('FRANK'); + expect(component.input).to.equal(null); + expect(component.el.querySelector('.name').innerHTML).to.equal('FRANK'); - widget.input = { + component.input = { name: 'Henry' }; - widget.update(); + component.update(); - expect(widget.input).to.equal(null); - expect(widget.el.querySelector('.name').innerHTML).to.equal('HENRY'); + expect(component.input).to.equal(null); + expect(component.el.querySelector('.name').innerHTML).to.equal('HENRY'); }); it('should allow input to be assigned to a new object', function() { - var widget = window.widgets['onInput-assign-object']; + var component = window.components['onInput-assign-object']; - expect(widget.input.name).to.equal('FRANK'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Frank'); + expect(component.input.name).to.equal('FRANK'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Frank'); - widget.input = { + component.input = { name: 'Jane' }; - widget.update(); + component.update(); - expect(widget.input.name).to.equal('JANE'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Jane'); + expect(component.input.name).to.equal('JANE'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Jane'); - widget.input = { + component.input = { name: 'Henry' }; - widget.update(); + component.update(); - expect(widget.input.name).to.equal('HENRY'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('Henry'); + expect(component.input.name).to.equal('HENRY'); + expect(component.el.querySelector('.name').innerHTML).to.equal('Henry'); }); it('should allow input to be assigned to a new object with return', function() { - var widget = window.widgets['onInput-assign-object-and-return']; + var component = window.components['onInput-assign-object-and-return']; - expect(widget.input.name).to.equal('HEATHER'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('heather'); + expect(component.input.name).to.equal('HEATHER'); + expect(component.el.querySelector('.name').innerHTML).to.equal('heather'); - widget.input = { + component.input = { name: 'Jane' }; - widget.update(); + component.update(); - expect(widget.input.name).to.equal('JANE'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('jane'); + expect(component.input.name).to.equal('JANE'); + expect(component.el.querySelector('.name').innerHTML).to.equal('jane'); - widget.input = { + component.input = { name: 'Henry' }; - widget.update(); + component.update(); - expect(widget.input.name).to.equal('HENRY'); - expect(widget.el.querySelector('.name').innerHTML).to.equal('henry'); + expect(component.input.name).to.equal('HENRY'); + expect(component.el.querySelector('.name').innerHTML).to.equal('henry'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/server-browser-unique-ids/components/app-foo/component.js b/test/autotests/components-pages/server-browser-unique-ids/components/app-foo/component.js index 1b596e93d..97bd15bd1 100644 --- a/test/autotests/components-pages/server-browser-unique-ids/components/app-foo/component.js +++ b/test/autotests/components-pages/server-browser-unique-ids/components/app-foo/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/server-browser-unique-ids/template.marko b/test/autotests/components-pages/server-browser-unique-ids/template.marko index 1fd7eb0c4..27c1f03d3 100644 --- a/test/autotests/components-pages/server-browser-unique-ids/template.marko +++ b/test/autotests/components-pages/server-browser-unique-ids/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,7 +16,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/server-browser-unique-ids/tests.js b/test/autotests/components-pages/server-browser-unique-ids/tests.js index d3d8190ad..460c75d0d 100644 --- a/test/autotests/components-pages/server-browser-unique-ids/tests.js +++ b/test/autotests/components-pages/server-browser-unique-ids/tests.js @@ -5,11 +5,11 @@ var appFooComponent = require('./components/app-foo'); describe(path.basename(__dirname), function() { it('should generate a unique ID that is different for a UI component rendered on the server and browser', function() { - var serverFooWidget = window.fooWidget; - var browserFooWidget = appFooComponent.renderSync({}).appendTo(document.body).getWidget(); - expect(browserFooWidget.id).to.be.a('string'); - expect(serverFooWidget.id).to.be.a('string'); - expect(serverFooWidget.id).to.not.equal(browserFooWidget.id); + var serverFooComponent = window.fooComponent; + var browserFooComponent = appFooComponent.renderSync({}).appendTo(document.body).getComponent(); + expect(browserFooComponent.id).to.be.a('string'); + expect(serverFooComponent.id).to.be.a('string'); + expect(serverFooComponent.id).to.not.equal(browserFooComponent.id); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/split-widget-renderer/browser.json b/test/autotests/components-pages/split-widget-renderer/browser.json index 0dd4c703b..977ec3728 100644 --- a/test/autotests/components-pages/split-widget-renderer/browser.json +++ b/test/autotests/components-pages/split-widget-renderer/browser.json @@ -1,6 +1,6 @@ { "dependencies": [ - "require: ./components/app-button-split/widget", - "require: ./components/widget-only/widget" + "require: ./components/app-button-split/component", + "require: ./components/component-only/component" ] } \ No newline at end of file diff --git a/test/autotests/components-pages/split-widget-renderer/components/widget-only/index.marko b/test/autotests/components-pages/split-widget-renderer/components/widget-only/index.marko index 87198fb12..1a0e68170 100644 --- a/test/autotests/components-pages/split-widget-renderer/components/widget-only/index.marko +++ b/test/autotests/components-pages/split-widget-renderer/components/widget-only/index.marko @@ -1 +1 @@ -widget-only \ No newline at end of file +component-only \ No newline at end of file diff --git a/test/autotests/components-pages/split-widget-renderer/components/widget-only/widget.js b/test/autotests/components-pages/split-widget-renderer/components/widget-only/widget.js index dca710258..f2117d1a5 100644 --- a/test/autotests/components-pages/split-widget-renderer/components/widget-only/widget.js +++ b/test/autotests/components-pages/split-widget-renderer/components/widget-only/widget.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.widgetOnly = this; + window.componentOnly = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/split-widget-renderer/template.marko b/test/autotests/components-pages/split-widget-renderer/template.marko index db398dd94..501adb5c0 100644 --- a/test/autotests/components-pages/split-widget-renderer/template.marko +++ b/test/autotests/components-pages/split-widget-renderer/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -13,11 +13,11 @@ html lang="en" div id="testsTarget" Test Button - + lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/split-widget-renderer/tests.js b/test/autotests/components-pages/split-widget-renderer/tests.js index 468908ff8..8d304ff4d 100644 --- a/test/autotests/components-pages/split-widget-renderer/tests.js +++ b/test/autotests/components-pages/split-widget-renderer/tests.js @@ -2,14 +2,14 @@ var path = require('path'); var expect = require('chai').expect; describe(path.basename(__dirname), function() { - it('should allow widget to be split from renderer', function() { - var widget = window.appButtonSplit; - expect(widget.el.innerHTML).to.equal('Test Button'); - widget.setLabel('New Label'); - expect(widget.el.innerHTML).to.equal('New Label'); + it('should allow component to be split from renderer', function() { + var component = window.appButtonSplit; + expect(component.el.innerHTML).to.equal('Test Button'); + component.setLabel('New Label'); + expect(component.el.innerHTML).to.equal('New Label'); }); - it('should allow UI component to only have a widget and an index.marko', function() { - expect(window.widgetOnly).to.be.an('object'); + it('should allow UI component to only have a component and an index.marko', function() { + expect(window.componentOnly).to.be.an('object'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/widget-config/components/app-foo/component.js b/test/autotests/components-pages/widget-config/components/app-foo/component.js index 71cc40e20..9e74b8d94 100644 --- a/test/autotests/components-pages/widget-config/components/app-foo/component.js +++ b/test/autotests/components-pages/widget-config/components/app-foo/component.js @@ -3,10 +3,10 @@ module.exports = { this.name = 'app-foo'; }, - onMount: function(widgetConfig) { - this.widgetConfig = { + onMount: function(componentConfig) { + this.componentConfig = { name: this.name }; - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/widget-config/template.marko b/test/autotests/components-pages/widget-config/template.marko index d12bca4a4..56efe35c3 100644 --- a/test/autotests/components-pages/widget-config/template.marko +++ b/test/autotests/components-pages/widget-config/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,13 +16,13 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate script --- - // window.fooWidget should not exist yet, but's store that in a variable to verify - window.afterInitWidgetsFooWidget = window.fooWidget; - window.afterInitWidgetsBarWidget = window.barWidget; + // window.fooComponent should not exist yet, but's store that in a variable to verify + window.afterInitComponentsFooComponent = window.fooComponent; + window.afterInitComponentsBarComponent = window.barComponent; --- lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/widget-config/tests.js b/test/autotests/components-pages/widget-config/tests.js index 17c37324a..fed19daa0 100644 --- a/test/autotests/components-pages/widget-config/tests.js +++ b/test/autotests/components-pages/widget-config/tests.js @@ -1,9 +1,9 @@ var path = require('path'); var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); describe(path.basename(__dirname), function() { - it('should serialize widget config down to the browser', function() { - expect(window.fooWidget.widgetConfig.name).to.equal('app-foo'); + it('should serialize component config down to the browser', function() { + expect(window.fooComponent.componentConfig.name).to.equal('app-foo'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/widget-fixed-id/browser.json b/test/autotests/components-pages/widget-fixed-id/browser.json index 22dc158c8..340c12311 100644 --- a/test/autotests/components-pages/widget-fixed-id/browser.json +++ b/test/autotests/components-pages/widget-fixed-id/browser.json @@ -1,6 +1,6 @@ { "dependencies": [ "require: ./components/app-fixed-id", - "require: ./components/app-hello/widget" + "require: ./components/app-hello/component" ] } \ No newline at end of file diff --git a/test/autotests/components-pages/widget-fixed-id/components/app-fixed-id/widget.js b/test/autotests/components-pages/widget-fixed-id/components/app-fixed-id/widget.js index 13945359b..d92e4902b 100644 --- a/test/autotests/components-pages/widget-fixed-id/components/app-fixed-id/widget.js +++ b/test/autotests/components-pages/widget-fixed-id/components/app-fixed-id/widget.js @@ -5,9 +5,9 @@ module.exports = { this.name = 'app-fixed-id'; window.appFixedId = this; }, - testGetWidget: function() { - var helloWidget = this.getWidget('hello'); - expect(helloWidget != null).to.equal(true); + testGetComponent: function() { + var helloComponent = this.getComponent('hello'); + expect(helloComponent != null).to.equal(true); }, testGetEl: function() { var wrapperEl = this.getEl('wrapper'); diff --git a/test/autotests/components-pages/widget-fixed-id/template.marko b/test/autotests/components-pages/widget-fixed-id/template.marko index 05fd14ac8..c551605d9 100644 --- a/test/autotests/components-pages/widget-fixed-id/template.marko +++ b/test/autotests/components-pages/widget-fixed-id/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,7 +16,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/widget-fixed-id/tests.js b/test/autotests/components-pages/widget-fixed-id/tests.js index 6dc513375..6b1908f64 100644 --- a/test/autotests/components-pages/widget-fixed-id/tests.js +++ b/test/autotests/components-pages/widget-fixed-id/tests.js @@ -2,10 +2,10 @@ var path = require('path'); var expect = require('chai').expect; describe(path.basename(__dirname), function() { - it('should allow fixed IDs for widgets', function() { - var widget = window.appFixedId; - expect(widget.id).to.equal('appFixedId'); - widget.testGetWidget(); - widget.testGetEl(); + it('should allow fixed IDs for components', function() { + var component = window.appFixedId; + expect(component.id).to.equal('appFixedId'); + component.testGetComponent(); + component.testGetEl(); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/widget-input-ref/components/app-bar/component.js b/test/autotests/components-pages/widget-input-ref/components/app-bar/component.js index 3fac1336d..8df0876aa 100644 --- a/test/autotests/components-pages/widget-input-ref/components/app-bar/component.js +++ b/test/autotests/components-pages/widget-input-ref/components/app-bar/component.js @@ -1,5 +1,5 @@ module.exports = { onMount: function() { - window.barWidget = this; + window.barComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/widget-input-ref/components/app-foo/component.js b/test/autotests/components-pages/widget-input-ref/components/app-foo/component.js index 1e3b6b1d8..4d2818a50 100644 --- a/test/autotests/components-pages/widget-input-ref/components/app-foo/component.js +++ b/test/autotests/components-pages/widget-input-ref/components/app-foo/component.js @@ -10,6 +10,6 @@ module.exports = { }, onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/widget-input-ref/template.marko b/test/autotests/components-pages/widget-input-ref/template.marko index 000574e69..c33d5cd77 100644 --- a/test/autotests/components-pages/widget-input-ref/template.marko +++ b/test/autotests/components-pages/widget-input-ref/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,7 +16,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/widget-input-ref/tests.js b/test/autotests/components-pages/widget-input-ref/tests.js index c6b6194e9..7d28fa91a 100644 --- a/test/autotests/components-pages/widget-input-ref/tests.js +++ b/test/autotests/components-pages/widget-input-ref/tests.js @@ -2,15 +2,15 @@ var path = require('path'); var expect = require('chai').expect; describe(path.basename(__dirname), function() { - it('should serialize widget input down to the browser', function() { - expect(window.barWidget.getWidget('foo')).to.equal(window.fooWidget); - expect(window.fooWidget.input.color).to.equal('#800'); - expect(window.fooWidget.el.textContent).to.equal('The current count is 0'); - expect(window.fooWidget.el.getAttribute('style')).to.equal('color:#800;'); - window.fooWidget.increment(); - window.fooWidget.update(); - expect(window.fooWidget.el.textContent).to.equal('The current count is 1'); - expect(window.fooWidget.el.getAttribute('style')).to.equal('color:#800;'); - expect(window.barWidget.getWidget('foo')).to.equal(window.fooWidget); + it('should serialize component input down to the browser', function() { + expect(window.barComponent.getComponent('foo')).to.equal(window.fooComponent); + expect(window.fooComponent.input.color).to.equal('#800'); + expect(window.fooComponent.el.textContent).to.equal('The current count is 0'); + expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;'); + window.fooComponent.increment(); + window.fooComponent.update(); + expect(window.fooComponent.el.textContent).to.equal('The current count is 1'); + expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;'); + expect(window.barComponent.getComponent('foo')).to.equal(window.fooComponent); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/widget-input/components/app-foo/component.js b/test/autotests/components-pages/widget-input/components/app-foo/component.js index 1e3b6b1d8..4d2818a50 100644 --- a/test/autotests/components-pages/widget-input/components/app-foo/component.js +++ b/test/autotests/components-pages/widget-input/components/app-foo/component.js @@ -10,6 +10,6 @@ module.exports = { }, onMount: function() { - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/widget-input/template.marko b/test/autotests/components-pages/widget-input/template.marko index 8c1f654bd..a249235fe 100644 --- a/test/autotests/components-pages/widget-input/template.marko +++ b/test/autotests/components-pages/widget-input/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,7 +16,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/widget-input/tests.js b/test/autotests/components-pages/widget-input/tests.js index 782143cbf..e580ecd83 100644 --- a/test/autotests/components-pages/widget-input/tests.js +++ b/test/autotests/components-pages/widget-input/tests.js @@ -2,13 +2,13 @@ var path = require('path'); var expect = require('chai').expect; describe(path.basename(__dirname), function() { - it('should serialize widget input down to the browser', function() { - expect(window.fooWidget.input.color).to.equal('#800'); - expect(window.fooWidget.el.textContent).to.equal('The current count is 0'); - expect(window.fooWidget.el.getAttribute('style')).to.equal('color:#800;'); - window.fooWidget.increment(); - window.fooWidget.update(); - expect(window.fooWidget.el.textContent).to.equal('The current count is 1'); - expect(window.fooWidget.el.getAttribute('style')).to.equal('color:#800;'); + it('should serialize component input down to the browser', function() { + expect(window.fooComponent.input.color).to.equal('#800'); + expect(window.fooComponent.el.textContent).to.equal('The current count is 0'); + expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;'); + window.fooComponent.increment(); + window.fooComponent.update(); + expect(window.fooComponent.el.textContent).to.equal('The current count is 1'); + expect(window.fooComponent.el.getAttribute('style')).to.equal('color:#800;'); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/widget-state/components/app-foo/component.js b/test/autotests/components-pages/widget-state/components/app-foo/component.js index 5c584bdc5..38d12b3ec 100644 --- a/test/autotests/components-pages/widget-state/components/app-foo/component.js +++ b/test/autotests/components-pages/widget-state/components/app-foo/component.js @@ -5,7 +5,7 @@ module.exports = { }; }, - onMount: function(widgetConfig) { - window.fooWidget = this; + onMount: function(componentConfig) { + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/widget-state/template.marko b/test/autotests/components-pages/widget-state/template.marko index c39eafc93..94fdb4ab2 100644 --- a/test/autotests/components-pages/widget-state/template.marko +++ b/test/autotests/components-pages/widget-state/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body diff --git a/test/autotests/components-pages/widget-state/tests.js b/test/autotests/components-pages/widget-state/tests.js index ba04c839d..b565eb879 100644 --- a/test/autotests/components-pages/widget-state/tests.js +++ b/test/autotests/components-pages/widget-state/tests.js @@ -2,11 +2,11 @@ var path = require('path'); var expect = require('chai').expect; describe(path.basename(__dirname), function() { - it('should serialize widget state down to the browser', function() { - expect(window.fooWidget.state.name).to.equal('app-foo'); + it('should serialize component state down to the browser', function() { + expect(window.fooComponent.state.name).to.equal('app-foo'); }); - it('should serialize widget config down to the browser', function() { + it('should serialize component config down to the browser', function() { window.appStateWatch.test(); }); }); \ No newline at end of file diff --git a/test/autotests/components-pages/xss/components/app-foo/component.js b/test/autotests/components-pages/xss/components/app-foo/component.js index d3560401b..d528d68c1 100644 --- a/test/autotests/components-pages/xss/components/app-foo/component.js +++ b/test/autotests/components-pages/xss/components/app-foo/component.js @@ -7,10 +7,10 @@ module.exports = { this.evil = ''; }, - onMount: function(widgetConfig) { - this.widgetConfig = { + onMount: function(componentConfig) { + this.componentConfig = { evil: this.evil }; - window.fooWidget = this; + window.fooComponent = this; } }; \ No newline at end of file diff --git a/test/autotests/components-pages/xss/template.marko b/test/autotests/components-pages/xss/template.marko index 9647ff480..4a7a554f3 100644 --- a/test/autotests/components-pages/xss/template.marko +++ b/test/autotests/components-pages/xss/template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -16,7 +16,7 @@ html lang="en" lasso-body - init-widgets + init-components lasso-slot name="mocha-run" diff --git a/test/autotests/components-pages/xss/tests.js b/test/autotests/components-pages/xss/tests.js index 48d5842ab..4606ace12 100644 --- a/test/autotests/components-pages/xss/tests.js +++ b/test/autotests/components-pages/xss/tests.js @@ -10,8 +10,8 @@ describe(path.basename(__dirname), function() { var ready = require('marko/ready'); ready(function() { - expect(window.fooWidget.state.evil).to.equal(''); - expect(window.fooWidget.widgetConfig.evil).to.equal(''); + expect(window.fooComponent.state.evil).to.equal(''); + expect(window.fooComponent.componentConfig.evil).to.equal(''); done(); }); }); diff --git a/test/autotests/components-server/cspNonce/components/app-simple/index.js b/test/autotests/components-server/cspNonce/components/app-simple/index.js index a226fb420..71882682f 100644 --- a/test/autotests/components-server/cspNonce/components/app-simple/index.js +++ b/test/autotests/components-server/cspNonce/components/app-simple/index.js @@ -1,15 +1,15 @@ -module.exports = require('marko/widgets/legacy').defineComponent({ +module.exports = require('marko/components/legacy').defineComponent({ template: require.resolve('./template.marko'), - getWidgetConfig: function() { + getComponentConfig: function() { return { - type: 'widget config' + type: 'component config' }; }, getInitialState: function() { return { - type: 'widget state' + type: 'component state' }; }, @@ -20,7 +20,7 @@ module.exports = require('marko/widgets/legacy').defineComponent({ }; }, - init: function(widgetConfig) { - this.widgetConfig = widgetConfig; + init: function(componentConfig) { + this.componentConfig = componentConfig; } }); \ No newline at end of file diff --git a/test/autotests/components-server/cspNonce/template.marko b/test/autotests/components-server/cspNonce/template.marko index f5810e07e..4922d896e 100644 --- a/test/autotests/components-server/cspNonce/template.marko +++ b/test/autotests/components-server/cspNonce/template.marko @@ -3,4 +3,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/test/autotests/components-server/getRenderedWidgets/components/app-simple/index.js b/test/autotests/components-server/getRenderedWidgets/components/app-simple/index.js index a226fb420..71882682f 100644 --- a/test/autotests/components-server/getRenderedWidgets/components/app-simple/index.js +++ b/test/autotests/components-server/getRenderedWidgets/components/app-simple/index.js @@ -1,15 +1,15 @@ -module.exports = require('marko/widgets/legacy').defineComponent({ +module.exports = require('marko/components/legacy').defineComponent({ template: require.resolve('./template.marko'), - getWidgetConfig: function() { + getComponentConfig: function() { return { - type: 'widget config' + type: 'component config' }; }, getInitialState: function() { return { - type: 'widget state' + type: 'component state' }; }, @@ -20,7 +20,7 @@ module.exports = require('marko/widgets/legacy').defineComponent({ }; }, - init: function(widgetConfig) { - this.widgetConfig = widgetConfig; + init: function(componentConfig) { + this.componentConfig = componentConfig; } }); \ No newline at end of file diff --git a/test/autotests/components-server/getRenderedWidgets/test.js b/test/autotests/components-server/getRenderedWidgets/test.js index 619a2035e..50bbb7afb 100644 --- a/test/autotests/components-server/getRenderedWidgets/test.js +++ b/test/autotests/components-server/getRenderedWidgets/test.js @@ -1,20 +1,20 @@ var expect = require('chai').expect; -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); module.exports = function(helpers, done) { var template = require('./template.marko'); template.renderToString({}, function(err, html, out) { - var renderedWidgets = markoWidgets.getRenderedWidgets(out); - expect(renderedWidgets).to.be.an('object'); + var renderedComponents = markoComponents.getRenderedComponents(out); + expect(renderedComponents).to.be.an('object'); - expect(Object.keys(renderedWidgets).length).to.equal(2); - var widgetDefs = renderedWidgets.w; - expect(widgetDefs.length).to.equal(3); + expect(Object.keys(renderedComponents).length).to.equal(2); + var componentDefs = renderedComponents.w; + expect(componentDefs.length).to.equal(3); - expect(widgetDefs[0][0]).to.equal('w0-w0'); - expect(widgetDefs[1][0]).to.equal('w0-w1'); - expect(widgetDefs[2][0]).to.equal('w0'); + expect(componentDefs[0][0]).to.equal('w0-w0'); + expect(componentDefs[1][0]).to.equal('w0-w1'); + expect(componentDefs[2][0]).to.equal('w0'); done(); }); }; \ No newline at end of file diff --git a/test/autotests/components-server/getRenderedWidgets/widget.js b/test/autotests/components-server/getRenderedWidgets/widget.js index aaa29fadd..688ccd183 100644 --- a/test/autotests/components-server/getRenderedWidgets/widget.js +++ b/test/autotests/components-server/getRenderedWidgets/widget.js @@ -1,5 +1,5 @@ -function Widget() { +function Component() { } -module.exports = Widget; \ No newline at end of file +module.exports = Component; \ No newline at end of file diff --git a/test/autotests/components-server/invalid-missing-template/test.js b/test/autotests/components-server/invalid-missing-template/test.js index c9870417c..5110da487 100644 --- a/test/autotests/components-server/invalid-missing-template/test.js +++ b/test/autotests/components-server/invalid-missing-template/test.js @@ -1,7 +1,7 @@ var expect = require('chai').expect; module.exports = function(helpers) { - var defineComponent = require('marko/widgets/legacy').defineComponent; + var defineComponent = require('marko/components/legacy').defineComponent; expect(function() { defineComponent({ // template: require.resolve('./template.marko'), diff --git a/test/autotests/components-server/invalid-missing-template/widget.js b/test/autotests/components-server/invalid-missing-template/widget.js index aaa29fadd..688ccd183 100644 --- a/test/autotests/components-server/invalid-missing-template/widget.js +++ b/test/autotests/components-server/invalid-missing-template/widget.js @@ -1,5 +1,5 @@ -function Widget() { +function Component() { } -module.exports = Widget; \ No newline at end of file +module.exports = Component; \ No newline at end of file diff --git a/test/autotests/components-server/w-bind-missing-widget/index.foo b/test/autotests/components-server/w-bind-missing-widget/index.foo index 91f0e3a92..7d08e5c41 100644 --- a/test/autotests/components-server/w-bind-missing-widget/index.foo +++ b/test/autotests/components-server/w-bind-missing-widget/index.foo @@ -1,4 +1,4 @@ -module.exports = require('marko/widgets').defineComponent({ +module.exports = require('marko/components').defineComponent({ template: require('./template.marko'), init: function() { diff --git a/test/autotests/taglib-lookup/forEachTag/expected.json b/test/autotests/taglib-lookup/forEachTag/expected.json index 7883ea1cf..fc177735d 100644 --- a/test/autotests/taglib-lookup/forEachTag/expected.json +++ b/test/autotests/taglib-lookup/forEachTag/expected.json @@ -238,9 +238,9 @@ "async-fragment-timeout", "async-fragment-error", "cached-fragment", - "_widget", - "init-widgets", + "_component", + "init-components", "w-preserve", "no-update", - "widget-types" + "component-types" ] diff --git a/test/autotests/taglib-lookup/getTagsSorted/expected.json b/test/autotests/taglib-lookup/getTagsSorted/expected.json index b4fe4105f..fe74c2b03 100644 --- a/test/autotests/taglib-lookup/getTagsSorted/expected.json +++ b/test/autotests/taglib-lookup/getTagsSorted/expected.json @@ -1,6 +1,6 @@ [ "_lasso-resources-root", - "_widget", + "_component", "*", "a", "abbr", @@ -134,7 +134,7 @@ "include", "include-html", "include-text", - "init-widgets", + "init-components", "input", "ins", "invoke", @@ -242,5 +242,5 @@ "w-preserve", "wbr", "while", - "widget-types" + "component-types" ] diff --git a/test/autotests/taglib-lookup/transformers-custom-node/test.js b/test/autotests/taglib-lookup/transformers-custom-node/test.js index 1022d97e1..528edf03f 100644 --- a/test/autotests/taglib-lookup/transformers-custom-node/test.js +++ b/test/autotests/taglib-lookup/transformers-custom-node/test.js @@ -11,5 +11,5 @@ exports.check = function(markoCompiler, expect) { expect(transformers.length).to.equal(3); expect(transformers[0].path.indexOf('core-transformer')).to.not.equal(-1); expect(transformers[1].path.indexOf('lasso-nonce-attr-transformer')).to.not.equal(-1); - expect(transformers[2].path.indexOf('widgets-transformer')).to.not.equal(-1); + expect(transformers[2].path.indexOf('components-transformer')).to.not.equal(-1); }; \ No newline at end of file diff --git a/test/autotests/taglib-lookup/transformers/test.js b/test/autotests/taglib-lookup/transformers/test.js index 8163b4103..fa3d2305a 100644 --- a/test/autotests/taglib-lookup/transformers/test.js +++ b/test/autotests/taglib-lookup/transformers/test.js @@ -22,7 +22,7 @@ exports.check = function(markoCompiler, expect) { expect(transformers[0].path.indexOf('foo')).to.not.equal(-1); expect(transformers[1].path.indexOf('core-transformer')).to.not.equal(-1); expect(transformers[2].path.indexOf('lasso-nonce-attr-transformer')).to.not.equal(-1); - expect(transformers[3].path.indexOf('widgets-transformer')).to.not.equal(-1); + expect(transformers[3].path.indexOf('components-transformer')).to.not.equal(-1); transformers = []; lookup.forEachTagTransformer('transform-bar', function(transformer) { @@ -33,5 +33,5 @@ exports.check = function(markoCompiler, expect) { expect(transformers[0].path.indexOf('core-transformer')).to.not.equal(-1); expect(transformers[1].path.indexOf('bar')).to.not.equal(-1); expect(transformers[2].path.indexOf('lasso-nonce-attr-transformer')).to.not.equal(-1); - expect(transformers[3].path.indexOf('widgets-transformer')).to.not.equal(-1); + expect(transformers[3].path.indexOf('components-transformer')).to.not.equal(-1); }; \ No newline at end of file diff --git a/test/browser-tests-runner/cli.js b/test/browser-tests-runner/cli.js index 737c6aada..cdd803234 100644 --- a/test/browser-tests-runner/cli.js +++ b/test/browser-tests-runner/cli.js @@ -20,7 +20,7 @@ if (options.testsFile) { } function populatePageOptions(pageName) { - var pageDir = path.join(__dirname, '../autotests/widgets-pages', pageName); + var pageDir = path.join(__dirname, '../autotests/components-pages', pageName); var pageTemplate = path.join(pageDir, 'template.marko'); options.pageTemplate = require(pageTemplate); options.generatedDir = './page-' + pageName; @@ -40,7 +40,7 @@ function go() { } if (options.pages || options.pagesDeprecated) { - var pagesPath = options.pages ? path.resolve(__dirname, '../autotests/widgets-pages') : path.resolve(__dirname, '../autotests/widgets-pages-deprecated'); + var pagesPath = options.pages ? path.resolve(__dirname, '../autotests/components-pages') : path.resolve(__dirname, '../autotests/components-pages-deprecated'); var pageNames = fs.readdirSync(pagesPath); var promise = pageNames.reduce(function(previousValue, pageName) { return previousValue diff --git a/test/browser-tests-runner/index.js b/test/browser-tests-runner/index.js index 42b62d5e7..f666177da 100644 --- a/test/browser-tests-runner/index.js +++ b/test/browser-tests-runner/index.js @@ -36,7 +36,7 @@ function generate(options) { "require-run: " + require.resolve('./mocha-setup'), 'require-run: ' + testsFile, "require: jquery", - "require: marko/widgets", + "require: marko/components", { "require-run": require.resolve('./mocha-run'), "slot": "mocha-run" diff --git a/test/browser-tests-runner/page-template.marko b/test/browser-tests-runner/page-template.marko index 5603350a7..150d92b1c 100644 --- a/test/browser-tests-runner/page-template.marko +++ b/test/browser-tests-runner/page-template.marko @@ -4,7 +4,7 @@ lasso-page dependencies=data.browserDependencies lasso=data.lasso html lang="en" head meta charset="UTF-8" - title -- Marko Widgets Tests + title -- Marko Components Tests lasso-head body @@ -14,7 +14,7 @@ html lang="en" lasso-body - init-widgets immediate + init-components immediate lasso-slot name="mocha-run" diff --git a/test/components-browser-tests.js b/test/components-browser-tests.js index a14c79509..ca152ef76 100644 --- a/test/components-browser-tests.js +++ b/test/components-browser-tests.js @@ -3,9 +3,9 @@ var BrowserHelpers = require('./util/BrowserHelpers'); if (typeof window !== 'undefined') { - describe('marko-widgets (browser)', function() { + describe('marko-components (browser)', function() { require('./util/autotest').runTests( - require('./autotests/widgets-browser/autotests.tests'), + require('./autotests/components-browser/autotests.tests'), function run(testFunc, done) { var helpers = new BrowserHelpers(); diff --git a/test/components-compilation-deprecated-tests.js b/test/components-compilation-deprecated-tests.js index 8030a997a..f25f38de4 100644 --- a/test/components-compilation-deprecated-tests.js +++ b/test/components-compilation-deprecated-tests.js @@ -8,8 +8,8 @@ var expect = require('chai').expect; require('marko/node-require').install(); -describe('marko-widgets (compilation, deprecated)', function() { - var autoTestDir = path.join(__dirname, 'autotests/widgets-compilation-deprecated'); +describe('marko-components (compilation, deprecated)', function() { + var autoTestDir = path.join(__dirname, 'autotests/components-compilation-deprecated'); autotest.scanDir(autoTestDir, function run(dir, helpers, done) { var templatePath = path.join(dir, 'index.marko'); diff --git a/test/components-compilation-tests.js b/test/components-compilation-tests.js index b5970a39c..1c6542b49 100644 --- a/test/components-compilation-tests.js +++ b/test/components-compilation-tests.js @@ -8,8 +8,8 @@ var expect = require('chai').expect; require('marko/node-require').install(); -describe('marko-widgets (compilation)', function() { - var autoTestDir = path.join(__dirname, 'autotests/widgets-compilation'); +describe('marko-components (compilation)', function() { + var autoTestDir = path.join(__dirname, 'autotests/components-compilation'); autotest.scanDir(autoTestDir, function run(dir, helpers, done) { var templatePath = path.join(dir, 'index.marko'); diff --git a/test/components-server-tests.js b/test/components-server-tests.js index 140245d36..fda13fed9 100644 --- a/test/components-server-tests.js +++ b/test/components-server-tests.js @@ -1,9 +1,9 @@ require('./util/patch-module'); require('marko/node-require').install(); -describe('marko-widgets (server)', function() { +describe('marko-components (server)', function() { require('./util/autotest').runTests( - require('./autotests/widgets-server/autotests.tests'), + require('./autotests/components-server/autotests.tests'), function run(testFunc, done) { require('marko/compiler').configure({ output: 'html' }); var helpers = {}; diff --git a/test/deprecated-widgets-browser-tests.js b/test/deprecated-widgets-browser-tests.js index 3223e917c..e8078120d 100644 --- a/test/deprecated-widgets-browser-tests.js +++ b/test/deprecated-widgets-browser-tests.js @@ -3,18 +3,18 @@ var BrowserHelpers = require('./util/BrowserHelpers'); if (typeof window !== 'undefined') { - describe('marko-widgets deprecated (browser)', function() { + describe('marko-components deprecated (browser)', function() { require('./util/autotest').runTests( - require('./autotests/widgets-browser-deprecated/autotests.tests'), + require('./autotests/components-browser-deprecated/autotests.tests'), function run(testFunc, done) { var helpers = new BrowserHelpers(); - require('marko/jquery').patchWidget(window.$); - require('marko/ready').patchWidget(); + require('marko/jquery').patchComponent(window.$); + require('marko/ready').patchComponent(); function cleanup() { - delete require('marko/widgets/Widget').prototype.$; - delete require('marko/widgets/Widget').prototype.ready; + delete require('marko/components/Component').prototype.$; + delete require('marko/components/Component').prototype.ready; } try { diff --git a/test/util/BrowserHelpers.js b/test/util/BrowserHelpers.js index 4fd3b1602..da21d0a44 100644 --- a/test/util/BrowserHelpers.js +++ b/test/util/BrowserHelpers.js @@ -1,10 +1,10 @@ var expect = require('chai').expect; var assert = require('assert'); -var markoWidgets = require('marko/widgets'); +var markoComponents = require('marko/components'); function BrowserHelpers() { this.logOutput = []; - this.widgets = []; + this.components = []; } BrowserHelpers.prototype = { @@ -39,24 +39,24 @@ BrowserHelpers.prototype = { var renderResult = component.renderSync(input) .appendTo(this.targetEl); - var widget; + var component; try { - widget = renderResult.getWidget(); + component = renderResult.getComponent(); } catch(e) {} - if (widget) { - this.widgets.push(widget); + if (component) { + this.components.push(component); } - return widget; + return component; }, log: function(data) { this.logOutput.push(data); }, - getWidgetForEl: function(el) { - return markoWidgets.getWidgetForEl(el); + getComponentForEl: function(el) { + return markoComponents.getComponentForEl(el); }, @@ -83,11 +83,11 @@ BrowserHelpers.prototype = { }, _cleanup: function() { - this.widgets.forEach(function(widget) { - widget.destroy(); + this.components.forEach(function(component) { + component.destroy(); }); - this.widgets = []; + this.components = []; this.targetEl.innerHTML = ''; }