From e1473dcce80a100a883c78979f72989a6ea8801f Mon Sep 17 00:00:00 2001 From: Leo Horie Date: Sat, 21 May 2016 01:20:54 -0400 Subject: [PATCH] fiddling w/ bundled var names --- index.js | 12 ++++++------ mithril.js | 38 ++++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/index.js b/index.js index 1aa1478d..72abea9e 100644 --- a/index.js +++ b/index.js @@ -1,14 +1,14 @@ "use strict" var m = require("./render/hyperscript") -var renderer = require("./render/render")(window) -var redraw = require("./api/pubsub")() +var rendererService = require("./render/render")(window) +var redrawService = require("./api/pubsub")() m.request = require("./request/request")(window, Promise).ajax -m.route = require("./api/router")(window, renderer, redraw) -m.mount = require("./api/mount")(renderer, redraw) +m.route = require("./api/router")(window, rendererService, redrawService) +m.mount = require("./api/mount")(rendererService, redrawService) m.trust = require("./render/trust") -m.render = renderer.render -m.redraw = redraw.publish +m.render = rendererService.render +m.redraw = redrawService.publish module.exports = m diff --git a/mithril.js b/mithril.js index 483f518f..a6b05895 100644 --- a/mithril.js +++ b/mithril.js @@ -84,7 +84,7 @@ function changeNS(ns, vnode) { } } var m = hyperscript -var renderer = function($window) { +var rendererService = function($window) { var $doc = $window.document var onevent function setEventCallback(callback) {return onevent = callback} @@ -559,7 +559,7 @@ var renderer = function($window) { } return {render: render, setEventCallback: setEventCallback} }(window) -var redraw = function() { +var redrawService = function() { var callbacks = [] function unsubscribe(callback) { var index = callbacks.indexOf(callback) @@ -860,46 +860,48 @@ var throttle = function(callback) { } } } -var autoredraw = function(root, renderer2, pubsub, callback) { +var autoredraw = function(root, renderer, pubsub, callback) { var run = throttle(callback) - renderer2.setEventCallback(function(e) { - if (e.redraw1 !== false) run() - }) + if (renderer != null) { + renderer.setEventCallback(function(e) { + if (e.redraw !== false) run() + }) + } if (pubsub != null) { - if (root.redraw1) pubsub.unsubscribe(root.redraw1) + if (root.redraw) pubsub.unsubscribe(root.redraw) pubsub.subscribe(run) } - return root.redraw1 = run + return root.redraw = run } -m.route = function($window, renderer1, pubsub) { +m.route = function($window, renderer, pubsub) { var router = coreRouter($window) var route = function(root, defaultRoute, routes) { var replay = router.defineRoutes(routes, function(component, args) { - renderer1.render(root, {tag: component, attrs: args}) + renderer.render(root, {tag: component, attrs: args}) }, function() { router.setPath(defaultRoute) }) - autoredraw(root, renderer1, pubsub, replay) + autoredraw(root, renderer, pubsub, replay) } route.link = router.link route.prefix = router.setPrefix return route -}(window, renderer, redraw) -m.mount = function(renderer3, pubsub) { +}(window, rendererService, redrawService) +m.mount = function(renderer, pubsub) { return function(root, component) { - var run = autoredraw(root, renderer3, pubsub, function() { - renderer3.render(root, {tag: component}) + var run = autoredraw(root, renderer, pubsub, function() { + renderer.render(root, {tag: component}) }) run() } -}(renderer, redraw) +}(rendererService, redrawService) m.trust = function(html) { return Node("<", undefined, undefined, html, undefined, undefined) } -m.render = renderer.render -m.redraw = redraw.publish +m.render = rendererService.render +m.redraw = redrawService.publish module.exports = m