archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2026-02-01 16:07:13 +00:00
Code Issues Projects Releases Wiki Activity

Simplified code related to rerendering a widget and putting info into out.global

Browse Source
This commit is contained in:
Patrick Steele-Idem 2016-12-16 06:25:47 -07:00
parent 18854ed043
commit b6d2aa285d
3 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widgets/Widget.js
View File

@ -520,14 +520,7 @@ Widget.prototype = widgetProto = {
var templateData = extend({}, props || self.__rawState);
var globalData = {};
globalData.__rerenderWidget = self;
globalData.__rerenderEl = self.el;
globalData.__rerender = true;
if (!props) {
globalData.__rerenderState = props ? null : self.__rawState;
}
globalData.$w = [self, !props && self.__rawState];
var fromEls = markoWidgets._roots(this, {});
var doc = this.__document;

37
widgets/renderer.js
View File

@ -4,6 +4,9 @@ var includeTag = require('./taglib/include-tag');
var repeatedId = require('./repeated-id');
var getRootEls = markoWidgets._roots;
var RERENDER_WIDGET_INDEX = 0;
var RERENDER_WIDGET_STATE_INDEX = 1;
function resolveWidgetRef(out, ref, scope) {
if (ref.charAt(0) === '#') {
return ref.substring(1);
@ -135,19 +138,25 @@ module.exports = function createRendererFunc(templateRenderFunc, widgetProps, re
var widgetConfig;
var widgetBody;
if (outGlobal.__rerenderWidget && outGlobal.__rerenderState) {
var rerenderInfo = outGlobal.$w;
var rerenderWidget;
var rerenderWidgetState;
if (rerenderInfo) {
rerenderWidget = rerenderInfo[RERENDER_WIDGET_INDEX];
rerenderWidgetState = rerenderInfo[RERENDER_WIDGET_STATE_INDEX];
rerenderInfo[RERENDER_WIDGET_INDEX] = null;
}
if (rerenderWidget && rerenderWidgetState) {
// This is a state-ful widget. If this is a rerender then the "input"
// will be the new state. If we have state then we should use the input
// as the widget state and skip the steps of converting the input
// to a widget state.
var isFirstWidget = !outGlobal.__firstWidgetFound;
if (isFirstWidget) {
// We are the first widget and we are not being extended
// and we are not extending so use the input as the state
widgetState = input;
input = null;
}
// We are the first widget and we are not being extended
// and we are not extending so use the input as the state
widgetState = input;
input = null;
}
var widgetArgs;
@ -203,13 +212,9 @@ module.exports = function createRendererFunc(templateRenderFunc, widgetProps, re
widgetArgs = input.$w;
}
outGlobal.__firstWidgetFound = true;
var customEvents;
var scope;
var id = assignedId;
if (!widgetArgs) {
@ -231,9 +236,6 @@ module.exports = function createRendererFunc(templateRenderFunc, widgetProps, re
customEvents = widgetArgs[2];
}
var rerenderWidget = outGlobal.__rerenderWidget;
var isRerender = outGlobal.__rerender === true;
var widgetsContext = markoWidgets.getWidgetsContext(out);
if (!id) {
@ -249,8 +251,7 @@ module.exports = function createRendererFunc(templateRenderFunc, widgetProps, re
if (rerenderWidget) {
existingWidget = rerenderWidget;
id = rerenderWidget.id;
delete outGlobal.__rerenderWidget;
} else if (isRerender) {
} else if (rerenderInfo) {
// Look in in the DOM to see if a widget with the same ID and type already exists.
existingWidget = widgetLookup[id];
if (existingWidget && existingWidget.__type !== typeName) {

2
widgets/taglib/preserve-tag.js
View File

@ -4,7 +4,7 @@ module.exports = function render(input, out) {
var global = out.global;
if (global.__rerender === true) {
if (global.$w) {
var id = input.id;
// See if the DOM node with the given ID already exists.