mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-26 15:23:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into demo-alternate-store

Browse Source
This commit is contained in:
jeremy@jermolene.com 2023-07-06 11:55:38 +01:00
commit f3bc32a2e9
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/widgets/widget.js
View File

@ -750,7 +750,9 @@ Widget.prototype.removeLocalDomNodes = function() {
// If this widget has directly created DOM nodes, delete them and exit.
if(this.domNodes.length > 0) {
$tw.utils.each(this.domNodes,function(domNode) {
domNode.parentNode.removeChild(domNode);
if(domNode.parentNode) {
domNode.parentNode.removeChild(domNode);
}
});
this.domNodes = [];
}

10
plugins/tiddlywiki/jasmine/jasmine-plugin.js
View File

@ -94,7 +94,11 @@ exports.runTests = function(callback,specFilter) {
if($tw.browser) {
window.jasmineRequire = jasmineCore;
$tw.modules.execute("$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/jasmine-html.js");
var previousOnloadHandler = window.onload;
window.onload = function() {};
$tw.modules.execute("$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/boot.js");
var jasmineOnloadHandler = window.onload;
window.onload = function() {};
jasmine = window.jasmine;
} else {
// Add missing properties to `jasmineCore` in order to call the Jasmine
@ -144,9 +148,11 @@ exports.runTests = function(callback,specFilter) {
// Iterate through all the test modules
var tests = $tw.wiki.filterTiddlers(TEST_TIDDLER_FILTER);
$tw.utils.each(tests,evalInContext);
// In a browser environment, jasmine-core/boot.js calls `execute()` for us.
// In a browser environment, we use jasmine-core/boot.js to call `execute()` for us.
// In Node.js, we call it manually.
if(!$tw.browser) {
if($tw.browser) {
jasmineOnloadHandler();
} else {
nodeJasmineWrapper.execute(null,specFilter);
}
};

3
plugins/tiddlywiki/jasmine/startup.js
View File

@ -17,8 +17,9 @@ var jasmine = require("./jasmine-plugin.js");
exports.name = "jasmine";
if($tw.browser) {
// Jasmine is run automatically on the browser, so always add it here.
exports.startup = jasmine.runTests;
exports.before = ["render"];
exports.after = ["story"];
} else {
// However, if we're on node.js, the tests are explciitly run with the
// --test command. This didn't used to be the case, so if they're