From 0d66da87a39e6660cbadbfbb457f14d4d61995ec Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 7 May 2018 14:34:17 -0400 Subject: [PATCH 1/4] Use can-importer --- can-view-autorender.js | 18 +++++++++--------- package.json | 4 ++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/can-view-autorender.js b/can-view-autorender.js index 7c389b6..289139d 100644 --- a/can-view-autorender.js +++ b/can-view-autorender.js @@ -1,9 +1,9 @@ -var canViewModel = require("can-view-model"); -var camelize = require("can-util/js/string/string").camelize; -var each = require("can-util/js/each/each"); -var importer = require("can-util/js/import/import"); var namespace = require("can-namespace"); -var domEvents = require("can-util/dom/events/events"); +var canViewModel = require("can-view-model"); +var canReflect = require("can-reflect"); +var camelize = require("can-string").camelize; +var importer = require("can-importer"); +var domEvents = require("can-dom-events"); var ignoreAttributesRegExp = /^(dataViewId|class|id|type|src)$/i; @@ -51,11 +51,11 @@ function render(renderer, scope, el) { function setupScope(el) { var scope = canViewModel(el); - each(el.attributes || [], function(attr) { + canReflect.each(el.attributes || [], function(attr) { setAttr(el, attr.name, scope); }); - domEvents.addEventListener.call(el, "attributes", function(ev) { + domEvents.addEventListener(el, "attributes", function(ev) { setAttr(el, ev.attributeName, scope); }); @@ -66,7 +66,7 @@ var promise = new Promise(function(resolve, reject) { function autoload(){ var promises = []; - each( document.querySelectorAll("[can-autorender]"), function( el, i){ + canReflect.each(document.querySelectorAll("[can-autorender]"), function( el, i){ el.style.display = "none"; var text = el.innerHTML || el.text, @@ -94,7 +94,7 @@ var promise = new Promise(function(resolve, reject) { if (document.readyState === "complete") { autoload(); } else { - domEvents.addEventListener.call(window, "load", autoload); + domEvents.addEventListener(window, "load", autoload); } }); diff --git a/package.json b/package.json index e855be2..76c9f87 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,11 @@ "donejs" ], "dependencies": { + "can-dom-events": "^1.2.0", + "can-importer": "^1.0.0", "can-namespace": "1.0.0", + "can-reflect": "^1.15.2", + "can-string": "0.0.4", "can-util": "^3.9.5", "can-view-model": "^4.0.0" }, From 600757aacc6dcc5c5be7bf0bc123d1f706cc406b Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 7 May 2018 14:35:26 -0400 Subject: [PATCH 2/4] Remove dependency on can-util --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 76c9f87..c3c6815 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "can-namespace": "1.0.0", "can-reflect": "^1.15.2", "can-string": "0.0.4", - "can-util": "^3.9.5", "can-view-model": "^4.0.0" }, "devDependencies": { From 9f115403c06a3ddabdcc49e4d81bb1b09af07fa4 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 7 May 2018 14:36:47 -0400 Subject: [PATCH 3/4] Use a better semver range for can-string --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3c6815..61b87aa 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "can-importer": "^1.0.0", "can-namespace": "1.0.0", "can-reflect": "^1.15.2", - "can-string": "0.0.4", + "can-string": "<2.0.0", "can-view-model": "^4.0.0" }, "devDependencies": { From 2a82e57d3508bdf92b546577a4b15e0789efd981 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 7 May 2018 15:04:21 -0400 Subject: [PATCH 4/4] use can-import-module --- can-view-autorender.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/can-view-autorender.js b/can-view-autorender.js index 289139d..6aa4043 100644 --- a/can-view-autorender.js +++ b/can-view-autorender.js @@ -2,7 +2,7 @@ var namespace = require("can-namespace"); var canViewModel = require("can-view-model"); var canReflect = require("can-reflect"); var camelize = require("can-string").camelize; -var importer = require("can-importer"); +var load = require("can-import-module"); var domEvents = require("can-dom-events"); var ignoreAttributesRegExp = /^(dataViewId|class|id|type|src)$/i; @@ -75,7 +75,7 @@ var promise = new Promise(function(resolve, reject) { type = typeInfo && typeInfo[1], typeModule = "can-" + type; - promises.push(importer(typeModule).then(function(engine){ + promises.push(load(typeModule).then(function(engine){ if(engine.async) { return engine.async(text).then(function(renderer){ render(renderer, setupScope(el), el); diff --git a/package.json b/package.json index 61b87aa..7074e50 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ ], "dependencies": { "can-dom-events": "^1.2.0", - "can-importer": "^1.0.0", + "can-import-module": "^1.0.0", "can-namespace": "1.0.0", "can-reflect": "^1.15.2", "can-string": "<2.0.0",