Merge pull request #144 from canjs/events-control

phillipskevin · web-flow · commit 78dc46f5db69 · 2019-10-03T10:48:07.000-05:00
renaming control constructor created to replace events object
diff --git a/src/templates/can-property-definitions/connected-events-output.js b/src/templates/can-property-definitions/connected-events-output.js
@@ -2,7 +2,7 @@ import { Control, StacheElement } from 'can';
 
 class CustomScroll extends StacheElement {
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       inserted () {
         const { viewModel } = this;
       },
@@ -12,6 +12,6 @@ class CustomScroll extends StacheElement {
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
-}
+}
diff --git a/src/templates/can-property-definitions/connected-events-output.md b/src/templates/can-property-definitions/connected-events-output.md
@@ -3,7 +3,7 @@ import { Control, StacheElement } from 'can';
 
 class CustomScroll extends StacheElement {
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       inserted () {
         const { viewModel } = this;
       },
@@ -13,7 +13,7 @@ class CustomScroll extends StacheElement {
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
 }
 ```
@@ -23,13 +23,13 @@ import { Control, StacheElement } from 'can';
 
 class MyScroll extends StacheElement {
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       '.form click': function (ev) {
         ev.preventDefault();
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
 }
-```
+```
diff --git a/src/templates/can-property-definitions/connected-events.js b/src/templates/can-property-definitions/connected-events.js
@@ -9,7 +9,7 @@ function transformer(file, api) {
   // Transform different file types
   return fileTransform(file, function (source) {
     const root = j(source);
-  
+
     return root
       .find(j.MethodDefinition, {
         key: {
@@ -24,22 +24,22 @@ function transformer(file, api) {
             name: 'events'
           }
         }).forEach(node => {
-          // Add a new vmControl which is a can-control extend
+          // Add a new EventsControl which is a can-control extend
           path.value.value.body.body.push(j.variableDeclaration('const', [
-            j.variableDeclarator(j.identifier('vmControl'), j.callExpression(
+            j.variableDeclarator(j.identifier('EventsControl'), j.callExpression(
               j.memberExpression(
                 j.identifier('Control'),
                 j.identifier('extend')
               ),
               [j.objectExpression(node.value.init.properties)]
             ))
-          ]), j.expressionStatement(j.newExpression(j.identifier('vmControl'), [j.identifier('this')])));
-  
+          ]), j.expressionStatement(j.newExpression(j.identifier('EventsControl'), [j.identifier('this')])));
+
           debug(`Removing 'events' from connected, replacing with Control.extend.`);
-  
+
           // Remove the events variable
           j(node).remove();
-  
+
           // Add the import
           addImport(j, root, { importName: 'Control' });
         });
@@ -50,4 +50,4 @@ function transformer(file, api) {
 
 transformer.forceJavaScriptTransform = true;
 
-export default transformer;
+export default transformer;
diff --git a/src/templates/can-property-definitions/connectedcallback-input.js b/src/templates/can-property-definitions/connectedcallback-input.js
@@ -22,13 +22,13 @@ class analogClock extends StacheElement {
   }
 
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       '.form click': function (ev) {
         ev.preventDefault();
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
 };
 customElements.define("analog-clock", analog-clock);
diff --git a/src/templates/can-property-definitions/connectedcallback-output.js b/src/templates/can-property-definitions/connectedcallback-output.js
@@ -16,13 +16,13 @@ class analogClock extends StacheElement {
   }
 
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       '.form click': function (ev) {
         ev.preventDefault();
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
     this.addEventListener('click', (ev) => ev.preventDefault());
 
     this.style.height = '200px';
diff --git a/test/fixtures/version-6/can-property-definitions/connected-events-output.js b/test/fixtures/version-6/can-property-definitions/connected-events-output.js
@@ -2,7 +2,7 @@ import { Control, StacheElement } from 'can';
 
 class CustomScroll extends StacheElement {
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       inserted () {
         const { viewModel } = this;
       },
@@ -12,6 +12,6 @@ class CustomScroll extends StacheElement {
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
-}
+}
diff --git a/test/fixtures/version-6/can-property-definitions/connected-events-output.md b/test/fixtures/version-6/can-property-definitions/connected-events-output.md
@@ -3,7 +3,7 @@ import { Control, StacheElement } from 'can';
 
 class CustomScroll extends StacheElement {
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       inserted () {
         const { viewModel } = this;
       },
@@ -13,7 +13,7 @@ class CustomScroll extends StacheElement {
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
 }
 ```
@@ -23,13 +23,13 @@ import { Control, StacheElement } from 'can';
 
 class MyScroll extends StacheElement {
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       '.form click': function (ev) {
         ev.preventDefault();
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
 }
-```
+```
diff --git a/test/fixtures/version-6/can-property-definitions/connectedcallback-input.js b/test/fixtures/version-6/can-property-definitions/connectedcallback-input.js
@@ -22,13 +22,13 @@ class analogClock extends StacheElement {
   }
 
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       '.form click': function (ev) {
         ev.preventDefault();
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
   }
 };
 customElements.define("analog-clock", analog-clock);
diff --git a/test/fixtures/version-6/can-property-definitions/connectedcallback-output.js b/test/fixtures/version-6/can-property-definitions/connectedcallback-output.js
@@ -16,13 +16,13 @@ class analogClock extends StacheElement {
   }
 
   connected() {
-    const vmControl = Control.extend({
+    const EventsControl = Control.extend({
       '.form click': function (ev) {
         ev.preventDefault();
       }
     });
 
-    new vmControl(this);
+    new EventsControl(this);
     this.addEventListener('click', (ev) => ev.preventDefault());
 
     this.style.height = '200px';

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { Control, StacheElement } from 'can';`
`3`	`3`
`4`	`4`	`class CustomScroll extends StacheElement {`
`5`	`5`	`connected() {`
`6`		`- const vmControl = Control.extend({`
	`6`	`+ const EventsControl = Control.extend({`
`7`	`7`	`inserted () {`
`8`	`8`	`const { viewModel } = this;`
`9`	`9`	`},`
`@@ -13,7 +13,7 @@ class CustomScroll extends StacheElement {`
`13`	`13`	`}`
`14`	`14`	`});`
`15`	`15`
`16`		`- new vmControl(this);`
	`16`	`+ new EventsControl(this);`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	```
`@@ -23,13 +23,13 @@ import { Control, StacheElement } from 'can';`
`23`	`23`
`24`	`24`	`class MyScroll extends StacheElement {`
`25`	`25`	`connected() {`
`26`		`- const vmControl = Control.extend({`
	`26`	`+ const EventsControl = Control.extend({`
`27`	`27`	`'.form click': function (ev) {`
`28`	`28`	`ev.preventDefault();`
`29`	`29`	`}`
`30`	`30`	`});`
`31`	`31`
`32`		`- new vmControl(this);`
	`32`	`+ new EventsControl(this);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		-```
	`35`	+```
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ class analogClock extends StacheElement {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`connected() {`
`25`		`- const vmControl = Control.extend({`
	`25`	`+ const EventsControl = Control.extend({`
`26`	`26`	`'.form click': function (ev) {`
`27`	`27`	`ev.preventDefault();`
`28`	`28`	`}`
`29`	`29`	`});`
`30`	`30`
`31`		`- new vmControl(this);`
	`31`	`+ new EventsControl(this);`
`32`	`32`	`}`
`33`	`33`	`};`
`34`	`34`	`customElements.define("analog-clock", analog-clock);`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ class analogClock extends StacheElement {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`connected() {`
`19`		`- const vmControl = Control.extend({`
	`19`	`+ const EventsControl = Control.extend({`
`20`	`20`	`'.form click': function (ev) {`
`21`	`21`	`ev.preventDefault();`
`22`	`22`	`}`
`23`	`23`	`});`
`24`	`24`
`25`		`- new vmControl(this);`
	`25`	`+ new EventsControl(this);`
`26`	`26`	`this.addEventListener('click', (ev) => ev.preventDefault());`
`27`	`27`
`28`	`28`	`this.style.height = '200px';`