Change new_widget to widget

I was avoiding doing this until after the merge.

core/modules/commands/new_rendertiddlers.js

@@ -12,7 +12,7 @@ Command to render several tiddlers to a folder of files
 /*global $tw: false */
 "use strict";
 
-var widget = require("$:/core/modules/new_widgets/widget.js");
+var widget = require("$:/core/modules/widgets/widget.js");
 
 exports.info = {
 	name: "new_rendertiddlers",

core/modules/parsers/wikiparser/rules/typedblock.js

@@ -28,7 +28,7 @@ $$$
 /*global $tw: false */
 "use strict";
 
-var widget = require("$:/core/modules/new_widgets/widget.js");
+var widget = require("$:/core/modules/widgets/widget.js");
 
 exports.name = "typedblock";
 exports.types = {block: true};

core/modules/startup.js

@@ -12,7 +12,7 @@ This is the main application logic for both the client and server
 /*global $tw: false */
 "use strict";
 
-var widget = require("$:/core/modules/new_widgets/widget.js");
+var widget = require("$:/core/modules/widgets/widget.js");
 
 exports.startup = function() {
 	var modules,n,m,f,commander;

core/modules/utils/dom/modal.js

@@ -12,7 +12,7 @@ Modal message mechanism
 /*global $tw: false */
 "use strict";
 
-var widget = require("$:/core/modules/new_widgets/widget.js");
+var widget = require("$:/core/modules/widgets/widget.js");
 
 var Modal = function(wiki) {
 	this.wiki = wiki;

core/modules/utils/dom/notifier.js

@@ -12,7 +12,7 @@ Notifier mechanism
 /*global $tw: false */
 "use strict";
 
-var widget = require("$:/core/modules/new_widgets/widget.js");
+var widget = require("$:/core/modules/widgets/widget.js");
 
 var Notifier = function(wiki) {
 	this.wiki = wiki;

core/modules/widgets/browse.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/browse.js
+title: $:/core/modules/widgets/browse.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Browse widget for browsing for files to import
 
@@ -12,7 +12,7 @@ Browse widget for browsing for files to import
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var BrowseWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/button.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/button.js
+title: $:/core/modules/widgets/button.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Button widget
 
@@ -12,7 +12,7 @@ Button widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var ButtonWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/checkbox.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/checkbox.js
+title: $:/core/modules/widgets/checkbox.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Checkbox widget
 
@@ -12,7 +12,7 @@ Checkbox widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var CheckboxWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/count.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/count.js
+title: $:/core/modules/widgets/count.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Count widget
 
@@ -12,7 +12,7 @@ Count widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var CountWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/dropzone.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/dropzone.js
+title: $:/core/modules/widgets/dropzone.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Dropzone widget
 
@@ -12,7 +12,7 @@ Dropzone widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var DropZoneWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/edit-bitmap.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/edit-bitmap.js
+title: $:/core/modules/widgets/edit-bitmap.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Edit-bitmap widget
 
@@ -16,7 +16,7 @@ Edit-bitmap widget
 var DEFAULT_IMAGE_WIDTH = 300,
 	DEFAULT_IMAGE_HEIGHT = 185;
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var EditBitmapWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/edit-text.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/edit-text.js
+title: $:/core/modules/widgets/edit-text.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Edit-text widget
 
@@ -14,7 +14,7 @@ Edit-text widget
 
 var MIN_TEXT_AREA_HEIGHT = 100; // Minimum height of textareas in pixels
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var EditTextWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/edit.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/edit.js
+title: $:/core/modules/widgets/edit.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Edit widget is a meta-widget chooses the appropriate actual editting widget
 
@@ -12,7 +12,7 @@ Edit widget is a meta-widget chooses the appropriate actual editting widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var EditWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/element.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/element.js
+title: $:/core/modules/widgets/element.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Element widget
 
@@ -12,7 +12,7 @@ Element widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var ElementWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/encrypt.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/encrypt.js
+title: $:/core/modules/widgets/encrypt.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Encrypt widget
 
@@ -12,7 +12,7 @@ Encrypt widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var EncryptWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/entity.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/entity.js
+title: $:/core/modules/widgets/entity.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 HTML entity widget
 
@@ -12,7 +12,7 @@ HTML entity widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var EntityWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/fieldmangler.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/fieldmangler.js
+title: $:/core/modules/widgets/fieldmangler.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Field mangler widget
 
@@ -12,7 +12,7 @@ Field mangler widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var FieldManglerWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/fields.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/fields.js
+title: $:/core/modules/widgets/fields.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Fields widget
 
@@ -12,7 +12,7 @@ Fields widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var FieldsWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/link.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/link.js
+title: $:/core/modules/widgets/link.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Link widget
 
@@ -12,7 +12,7 @@ Link widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var LinkWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/linkcatcher.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/linkcatcher.js
+title: $:/core/modules/widgets/linkcatcher.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Linkcatcher widget
 
@@ -12,7 +12,7 @@ Linkcatcher widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var LinkCatcherWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/list.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/list.js
+title: $:/core/modules/widgets/list.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 List and list item widgets
 
@@ -12,7 +12,7 @@ List and list item widgets
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 /*
 The list widget creates list element sub-widgets that reach back into the list widget for their configuration

core/modules/widgets/macrocall.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/macrocall.js
+title: $:/core/modules/widgets/macrocall.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Macrocall widget
 
@@ -12,7 +12,7 @@ Macrocall widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var MacroCallWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/navigator.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/navigator.js
+title: $:/core/modules/widgets/navigator.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Navigator widget
 
@@ -12,7 +12,7 @@ Navigator widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var NavigatorWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/password.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/password.js
+title: $:/core/modules/widgets/password.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Password widget
 
@@ -12,7 +12,7 @@ Password widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var PasswordWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/reveal.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/reveal.js
+title: $:/core/modules/widgets/reveal.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Reveal widget
 
@@ -12,7 +12,7 @@ Reveal widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var RevealWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/setvariable.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/setvariable.js
+title: $:/core/modules/widgets/setvariable.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Setvariable widget
 
@@ -12,7 +12,7 @@ Setvariable widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var SetVariableWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/text.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/text.js
+title: $:/core/modules/widgets/text.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Text node widget
 
@@ -12,7 +12,7 @@ Text node widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var TextNodeWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/tiddler.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/tiddler.js
+title: $:/core/modules/widgets/tiddler.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Tiddler widget
 
@@ -12,7 +12,7 @@ Tiddler widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var TiddlerWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/transclude.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/transclude.js
+title: $:/core/modules/widgets/transclude.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Transclude widget
 
@@ -12,7 +12,7 @@ Transclude widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var TranscludeWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/view.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/view.js
+title: $:/core/modules/widgets/view.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 View widget
 
@@ -12,7 +12,7 @@ View widget
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget;
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var ViewWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);

core/modules/widgets/widget.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/widget.js
+title: $:/core/modules/widgets/widget.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Widget base class
 
@@ -47,7 +47,7 @@ Widget.prototype.initialise = function(parseTreeNode,options) {
 	this.eventListeners = {};
 	// Hashmap of the widget classes
 	if(!this.widgetClasses) {
-		Widget.prototype.widgetClasses = $tw.modules.applyMethods("new_widget");
+		Widget.prototype.widgetClasses = $tw.modules.applyMethods("widget");
 	}
 };
 

core/modules/wiki.js

@@ -24,7 +24,7 @@ last dispatched. Each entry is a hashmap containing two fields:
 /*global $tw: false */
 "use strict";
 
-var widget = require("$:/core/modules/new_widgets/widget.js");
+var widget = require("$:/core/modules/widgets/widget.js");
 
 var USER_NAME_TITLE = "$:/status/UserName";
 

editions/test/tiddlers/tests/test-widget.js

@@ -14,7 +14,7 @@ Tests the wikitext rendering pipeline end-to-end. We also need tests that indivi
 
 describe("Widget module", function() {
 
-	var widget = require("$:/core/modules/new_widgets/widget.js");
+	var widget = require("$:/core/modules/widgets/widget.js");
 
 	function createWidgetNode(parseTreeNode,wiki,variables) {
 		return new widget.widget(parseTreeNode,{

editions/tw5.com/tiddlers/moduletypes/WidgetModules.tid

@@ -11,7 +11,7 @@ Widget modules are used as part of the RenderingMechanism to implement each type
 * HTML element nodes
 * HTML entities
 
-All widgets inherit from a base widget class that is defined in [[$:/core/modules/new_widgets/widget.js]].
+All widgets inherit from a base widget class that is defined in [[$:/core/modules/widgets/widget.js]].
 
 ! Widget Properties
 
@@ -50,7 +50,7 @@ The event listeners attached to a widget are stored as a hashmap by event type.
 
 ! Widget methods
 
-The individual methods defined by the widget object are documented in the source code of [[$:/core/modules/new_widgets/widget.js]]. Here we give an overview of the overall lifecycle, and how the methods fit together
+The individual methods defined by the widget object are documented in the source code of [[$:/core/modules/widgets/widget.js]]. Here we give an overview of the overall lifecycle, and how the methods fit together
 
 !! Widget `initialise` method
 !! Widget `widgetClasses` method

plugins/tiddlywiki/codemirror/codemirroreditor.js

@@ -1,7 +1,7 @@
 /*\
-title: $:/core/modules/new_widgets/edit-text-codemirror.js
+title: $:/core/modules/widgets/edit-text-codemirror.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 Extend the edit-text widget to use CodeMirror
 
@@ -16,7 +16,7 @@ if($tw.browser) {
     require("$:/plugins/tiddlywiki/codemirror/codemirror.js");
 }
 
-var EditTextWidget = require("$:/core/modules/new_widgets/edit-text.js")["edit-text"];
+var EditTextWidget = require("$:/core/modules/widgets/edit-text.js")["edit-text"];
 
 /*
 The edit-text widget calls this method just after inserting its dom nodes

plugins/tiddlywiki/d3/barwidget.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/plugins/tiddlywiki/d3/barwidget.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 A widget for displaying stacked or grouped bar charts. Derived from http://bl.ocks.org/mbostock/3943967
 
@@ -12,7 +12,7 @@ A widget for displaying stacked or grouped bar charts. Derived from http://bl.oc
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget,
+var Widget = require("$:/core/modules/widgets/widget.js").widget,
 	d3 = require("$:/plugins/tiddlywiki/d3/d3.js").d3;
 
 var BarWidget = function(parseTreeNode,options) {

plugins/tiddlywiki/d3/cloudwidget.js

@@ -1,7 +1,7 @@
 /*\
 title: $:/plugins/tiddlywiki/d3/cloudwidget.js
 type: application/javascript
-module-type: new_widget
+module-type: widget
 
 A widget for displaying word clouds. Derived from https://github.com/jasondavies/d3-cloud
 
@@ -12,7 +12,7 @@ A widget for displaying word clouds. Derived from https://github.com/jasondavies
 /*global $tw: false */
 "use strict";
 
-var Widget = require("$:/core/modules/new_widgets/widget.js").widget,
+var Widget = require("$:/core/modules/widgets/widget.js").widget,
 	d3 = require("$:/plugins/tiddlywiki/d3/d3.js").d3;
 
 if($tw.browser) {