Modul:Tutorials - Versionsgeschichte

Martin Kraft am 10. Juni 2018 um 12:25 Uhr

2018-06-10T12:25:46Z

@@ Zeile 160: / Zeile 160: @@
     return '<h2>' .. node.name .. '</h2>' .. html
 end
@@ Zeile 168: / Zeile 199: @@
 function p.navIndex(frame)
     mw.log('Lua navIndex ', frame)
     init( frame.args[config] );
-    return refNode.childHtml
+    return node.refNode.childHtml
 end

Martin Kraft: generalisiert

2018-06-09T23:18:30Z

generalisiert

Änderungen zeigen

Martin Kraft: Table-Bug behoben

2018-06-03T10:31:49Z

Table-Bug behoben

← Nächstältere Version		Version vom 3. Juni 2018, 12:31 Uhr
Zeile 40:		Zeile 40:

	if node.children then		if node.children then
	~~childIndex~~ = 1		local newChildrenArray = {}

⚫	~~while childIndex < #~~node.children do
	childNode = node.children~~[childIndex]~~		for childIndex, childNode in pairs( node.children ) do

	initNode(childNode, childIndex, node)		initNode(childNode, childIndex, node)


	if childNode.containsCurrentPage then		if childNode.containsCurrentPage then
	node.containsCurrentPage = true		node.containsCurrentPage = true
	end		end
			if not (childNode.hidden and childNode.containsCurrentPage == false) then

	if ~~childNode.hidden~~ ~~and~~ ~~childNode~~.~~containsCurrentPage~~ == ~~false~~ ~~then~~		node.childCount = node.childCount + 1
	~~table.remove(~~ node.~~children,~~ ~~childIndex~~ )		newChildrenArray[node.childCount] = childNode
	else
	childIndex = childIndex + 1
	end		end
	end		end
		⚫	node.children = newChildrenArray
	end		end

	if parentNode then		if parentNode then
	node.parent = parentNode		node.parent = parentNode
	parentNode.childCount = i
	end		end

Martin Kraft: + hidden

2018-06-03T09:59:37Z

+ hidden

← Nächstältere Version		Version vom 3. Juni 2018, 11:59 Uhr
Zeile 10:		Zeile 10:

	local configData, structureData, templateData		local configData, structureData, templateData
	local currentTitle, currentNode, refNode, currentPageNo, totalPageNo, lastNode, nextNode, isAllPage		local currentTitle, currentNode, refNode, currentPageNo, totalPageNo, lastNode, nextNode, isAllPage, isLastNode = false
	local inited = false		local inited = false

Zeile 29:		Zeile 29:
	node.title = mw.title.new(node.page)		node.title = mw.title.new(node.page)
	node.isCurrentPage = mw.title.equals( currentTitle, node.title )		node.isCurrentPage = mw.title.equals( currentTitle, node.title )
			node.containsCurrentPage = node.isCurrentPage;

	if not node.isCurrentPage and node.all then		if not node.isCurrentPage and node.all then
Zeile 39:		Zeile 40:

	if node.children then		if node.children then
	~~for~~ childIndex~~, childNode in pairs( node.children~~ ) do		childIndex = 1
			while childIndex < #node.children do
			childNode = node.children[childIndex]
	initNode(childNode, childIndex, node)		initNode(childNode, childIndex, node)

			if childNode.containsCurrentPage then
			node.containsCurrentPage = true
			end

			if childNode.hidden and childNode.containsCurrentPage == false then
			table.remove( node.children, childIndex )
			else
			childIndex = childIndex + 1
			end
	end		end
	end		end
Zeile 98:		Zeile 111:
	if currentNode then		if currentNode then
	currentPageNo = currentNode.index		currentPageNo = currentNode.index
	if currentNode.parent and currentNode.childCount==0 then		if currentNode.parent and currentNode.childCount==0 then
			-- Subpages
	refNode = currentNode.parent		refNode = currentNode.parent
	totalPageNo = currentNode.parent.childCount		totalPageNo = currentNode.parent.childCount
Zeile 104:		Zeile 118:
	if currentPageNo < totalPageNo then		if currentPageNo < totalPageNo then
	nextNode = currentNode.parent.children[currentPageNo+1]		nextNode = currentNode.parent.children[currentPageNo+1]
			else
			isLastNode = true
			-- Search next Tutorial
	end		end
	else		else
			-- Mainpages
	refNode = currentNode		refNode = currentNode
	if currentNode.childCount>0 then		if currentNode.childCount>0 then

Martin Kraft am 10. Mai 2018 um 21:47 Uhr

2018-05-10T21:47:41Z

← Nächstältere Version		Version vom 10. Mai 2018, 23:47 Uhr
Zeile 158:		Zeile 158:
	else		else
	if currentPageNo == 0 then		if currentPageNo == 0 then
	pagina = templateData.~~startPagina~~		pagina = templateData.paginaStart
	else		else
	pagina = templateData.pagina		pagina = templateData.pagina

Martin Kraft am 10. Mai 2018 um 21:43 Uhr

2018-05-10T21:43:52Z

@@ Zeile 157: / Zeile 157: @@
         pagina = templateData.paginaAll:gsub("§§page§§", refNode.page);
     else
         if currentPageNo == 0 then
-            pagina = ""
+            pagina = templateData.startPagina
         else
-            pagina = templateData.pagina:gsub("§§totalPageNo§§", totalPageNo ):gsub("§§currentPageNo§§", currentPageNo )
+            pagina = templateData.pagina
         end
     end

Martin Kraft am 10. Mai 2018 um 21:40 Uhr

2018-05-10T21:40:59Z

@@ Zeile 157: / Zeile 157: @@
         pagina = templateData.paginaAll:gsub("§§page§§", refNode.page);
     else
-        btnHtml = ''
+        if currentPageNo == 0 then
-        if lastNode then
+            pagina = ""
-        btnHtml = ''
+            if lastNode then
-        btnHtml = ''
+            if nextNode then
     end

Martin Kraft am 5. Februar 2018 um 11:18 Uhr

2018-02-05T11:18:16Z

← Nächstältere Version		Version vom 5. Februar 2018, 13:18 Uhr
Zeile 153:		Zeile 153:
	init( frame.args[config] );		init( frame.args[config] );

	local pagina ~~= currentPageNo .. '/' .. totalPageNo~~		local pagina, btnHtml;
		⚫	if isAllPage then
	if templateData.paginaDelimiter then pagina = pagina:gsub("/", templateData.paginaDelimiter) end
	~~local~~ ~~widgetHtml~~ = templateData.~~widget~~:gsub("§§~~threadNavi~~§§", refNode.~~innerHtml .. refNode.childHtml~~ )		pagina = templateData.paginaAll:gsub("§§page§§", refNode.page);
		⚫	else
⚫	~~widgetHtml~~ = ~~widgetHtml~~:gsub("§§~~pagina~~§§", ~~pagina~~ )
			pagina = templateData.pagina:gsub("§§totalPageNo§§", totalPageNo ):gsub("§§currentPageNo§§", currentPageNo )

	~~local~~ ~~btnLast~~ = ''		btnHtml = ''
	if lastNode then		if lastNode then
	~~btnLast~~ = templateData.btnLast:gsub("§§page§§", lastNode.page ):gsub("§§name§§", lastNode.name )		btnHtml = templateData.btnLast:gsub("§§page§§", lastNode.page ):gsub("§§name§§", lastNode.name )
	end		end
	~~widgetHtml~~ = ~~widgetHtml~~:gsub("§§btnLast§§", ~~btnLast~~ )		pagina = pagina:gsub("§§btnLast§§", btnHtml )


	~~local~~ ~~btnNext~~ = ''		btnHtml = ''
	if nextNode then		if nextNode then
	~~btnNext~~ = templateData.btnNext:gsub("§§page§§", nextNode.page ):gsub("§§name§§", nextNode.name )		btnHtml = templateData.btnNext:gsub("§§page§§", nextNode.page ):gsub("§§name§§", nextNode.name )
			end
		⚫	pagina = pagina:gsub("§§btnNext§§", btnHtml )

			btnHtml = ''
			if refNode.all then
		⚫	btnHtml = templateData.btnAll:gsub("§§page§§", refNode.all )
			end
		⚫	pagina = pagina:gsub("§§btnAll§§", btnHtml )
	end		end
⚫	~~widgetHtml~~ = ~~widgetHtml~~:gsub("§§btnNext§§", ~~btnNext~~ )

			local widgetHtml = templateData.widget:gsub("§§rootPage§§",structureData.page):gsub("§§threadNavi§§", refNode.innerHtml .. refNode.childHtml ):gsub("§§pagina§§", pagina )
	local btnAll = ''
⚫	if ~~refNode.all~~ then
⚫	~~btnAll~~ = templateData.btnAll:gsub("§§page§§", refNode.all )
⚫	~~end~~
	widgetHtml = widgetHtml:gsub("§§btnAll§§", btnAll )

	return widgetHtml		return widgetHtml

Martin Kraft am 5. Februar 2018 um 10:45 Uhr

2018-02-05T10:45:53Z

← Nächstältere Version		Version vom 5. Februar 2018, 12:45 Uhr
Zeile 10:		Zeile 10:

	local configData, structureData, templateData		local configData, structureData, templateData
	local currentTitle, currentNode, refNode, currentPageNo, totalPageNo, lastNode, nextNode		local currentTitle, currentNode, refNode, currentPageNo, totalPageNo, lastNode, nextNode, isAllPage
	local inited = false		local inited = false

Zeile 38:		Zeile 38:
	end		end

			if node.children then
			for childIndex, childNode in pairs( node.children ) do
			initNode(childNode, childIndex, node)
		⚫	end
			end

		⚫	if parentNode then
		⚫	node.parent = parentNode
			parentNode.childCount = i
			end

	if node.isCurrentPage then		if node.isCurrentPage then
	currentNode = node		currentNode = node
			end

			return node;
			end

			function prepareNodeHtml(node, i, parentNode)
			if node.isCurrentPage then
	node.innerHtml = templateData.threadNaviItemActive		node.innerHtml = templateData.threadNaviItemActive
	else		else
Zeile 45:		Zeile 63:
	end		end

	node.innerHtml = node.innerHtml:gsub("§§page§§", node.~~page~~)		if isAllPage then
			node.innerHtml = node.innerHtml:gsub("§§page§§", '#' .. node.name)
			else
			node.innerHtml = node.innerHtml:gsub("§§page§§", node.page)
			end
	node.innerHtml = node.innerHtml:gsub("§§name§§", node.name)		node.innerHtml = node.innerHtml:gsub("§§name§§", node.name)

	node.childHtml = ''		node.childHtml = ''
⚫
	if node.children then		if node.children then
	for childIndex, childNode in pairs( node.children ) do		for childIndex, childNode in pairs( node.children ) do
	~~initNode~~(childNode, childIndex, node)		prepareNodeHtml(childNode, childIndex, node)
	end		end
	end		end
Zeile 64:		Zeile 85:

	if parentNode then		if parentNode then
⚫	node.parent = parentNode
⚫	parentNode~~.childCount =~~ i
	parentNode.childHtml = parentNode.childHtml .. node.outerHtml		parentNode.childHtml = parentNode.childHtml .. node.outerHtml
	end		end

	return node;		return node;
	end		end;

	initNode(structureData, 0)		initNode(structureData, 0)
Zeile 101:		Zeile 120:
	end		end
	end		end
			end

			if currentNode.isAllPage then
			isAllPage = true
	end		end
	end		end

			prepareNodeHtml(structureData, 0)
	end		end

Zeile 174:		Zeile 199:
	function p.isAll(frame)		function p.isAll(frame)
	init( frame.args[config] );		init( frame.args[config] );
	return ~~currentNode and currentNode.~~isAllPage		return isAllPage
	end		end

Martin Kraft: Änderung 173683064 von Martin Kraft rückgängig gemacht;

2018-02-05T10:35:36Z

Änderung 173683064 von Martin Kraft rückgängig gemacht;

← Nächstältere Version		Version vom 5. Februar 2018, 12:35 Uhr
Zeile 10:		Zeile 10:

	local configData, structureData, templateData		local configData, structureData, templateData
	local currentTitle, currentNode, refNode, currentPageNo, totalPageNo, lastNode, nextNode~~, isAllPage = false;~~		local currentTitle, currentNode, refNode, currentPageNo, totalPageNo, lastNode, nextNode
	local inited = false		local inited = false

Zeile 38:		Zeile 38:
	end		end

	if node.children then
	for childIndex, childNode in pairs( node.children ) do
	initNode(childNode, childIndex, node)
	end
	end

⚫	if parentNode ~~then~~
⚫	node.parent = parentNode
	parentNode.childCount = i
	end

⚫	~~return~~ node;
	end

	function prepareNodeHtml(node, i, parentNode)
	if node.isCurrentPage then		if node.isCurrentPage then
		⚫	currentNode = node
	node.innerHtml = templateData.threadNaviItemActive		node.innerHtml = templateData.threadNaviItemActive
	else		else
Zeile 59:		Zeile 45:
	end		end

		⚫	node.innerHtml = node.innerHtml:gsub("§§page§§", node.page)
	local urlPrefix = isAllPage and '#' or ''
⚫	node.innerHtml = node.innerHtml:gsub("§§page§§", ~~urlPrefix ..~~ node.page)
	node.innerHtml = node.innerHtml:gsub("§§name§§", node.name)		node.innerHtml = node.innerHtml:gsub("§§name§§", node.name)

Zeile 67:		Zeile 52:
	if node.children then		if node.children then
	for childIndex, childNode in pairs( node.children ) do		for childIndex, childNode in pairs( node.children ) do
	~~prepareNodeHtml~~(childNode, childIndex, node)		initNode(childNode, childIndex, node)
	end		end
	end		end
Zeile 79:		Zeile 64:

	if parentNode then		if parentNode then
		⚫	node.parent = parentNode
		⚫	parentNode.childCount = i
	parentNode.childHtml = parentNode.childHtml .. node.outerHtml		parentNode.childHtml = parentNode.childHtml .. node.outerHtml
	end		end

	return node;		return node;
	end;		end

	initNode(structureData, 0)		initNode(structureData, 0)
Zeile 114:		Zeile 101:
	end		end
	end		end
	end

	if currentNode.isAllPage then
	isAllPage = true
	end		end
	end		end

	prepareNodeHtml(structureData, 0)
	end		end

Zeile 193:		Zeile 174:
	function p.isAll(frame)		function p.isAll(frame)
	init( frame.args[config] );		init( frame.args[config] );
	return isAllPage		return currentNode and currentNode.isAllPage
	end		end