mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Add test to storyviews if targetElement is null (#5767)

Browse Source 
* Update classic.js

* Update pop.js

* Update zoomin.js

* simplify test in classic.js

* simplify test in pop.js

* simplify test in zoomin.js
This commit is contained in:
Simon Huber 2021-06-09 11:18:15 +02:00 committed by GitHub
parent c18b7527a7
commit 219beb13cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/storyviews/classic.js
View File

@ -27,7 +27,7 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
var listItemWidget = this.listWidget.children[listElementIndex],
targetElement = listItemWidget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
if(duration) {
@ -43,7 +43,7 @@ ClassicStoryView.prototype.insert = function(widget) {
if(duration) {
var targetElement = widget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Get the current height of the tiddler
@ -83,7 +83,7 @@ ClassicStoryView.prototype.remove = function(widget) {
widget.removeChildDomNodes();
};
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
removeElement();
return;
}

6
core/modules/storyviews/pop.js
View File

@ -24,7 +24,7 @@ PopStoryView.prototype.navigateTo = function(historyInfo) {
var listItemWidget = this.listWidget.children[listElementIndex],
targetElement = listItemWidget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Scroll the node into view
@ -35,7 +35,7 @@ PopStoryView.prototype.insert = function(widget) {
var targetElement = widget.findFirstDomNode(),
duration = $tw.utils.getAnimationDuration();
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Reset once the transition is over
@ -77,7 +77,7 @@ PopStoryView.prototype.remove = function(widget) {
}
};
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
removeElement();
return;
}

6
core/modules/storyviews/zoomin.js
View File

@ -48,7 +48,7 @@ ZoominListView.prototype.navigateTo = function(historyInfo) {
var listItemWidget = this.listWidget.children[listElementIndex],
targetElement = listItemWidget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Make the new tiddler be position absolute and visible so that we can measure it
@ -130,7 +130,7 @@ function findTitleDomNode(widget,targetClass) {
ZoominListView.prototype.insert = function(widget) {
var targetElement = widget.findFirstDomNode();
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
return;
}
// Make the newly inserted node position absolute and hidden
@ -147,7 +147,7 @@ ZoominListView.prototype.remove = function(widget) {
widget.removeChildDomNodes();
};
// Abandon if the list entry isn't a DOM element (it might be a text node)
if(targetElement === undefined || targetElement.nodeType === Node.TEXT_NODE) {
if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
removeElement();
return;
}