Skip to content

Commit

Permalink
Remove obsolete _TemplateMixin variable when not using templates
Browse files Browse the repository at this point in the history
  • Loading branch information
JelteMX committed Oct 20, 2016
1 parent a911e93 commit a09b739
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ define([
"dojo/_base/event",
<% if (options.jquery) { %> "<%= widgetName %>/lib/jquery-1.11.2",<% } %>
<% if (options.templates) { %> "dojo/text!<%= widgetName %>/widget/template/<%= widgetName %>.html"<% } %>
], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, dojoProp, dojoGeometry, dojoClass, dojoStyle, dojoConstruct, dojoArray, dojoLang, dojoText, dojoHtml, dojoEvent<% if (options.jquery) { %>, _jQuery<% } %><% if (options.templates) { %>, widgetTemplate<% } %>) {
], function (declare, _WidgetBase<% if (options.templates) { %>, _TemplatedMixin<% } %>, dom, dojoDom, dojoProp, dojoGeometry, dojoClass, dojoStyle, dojoConstruct, dojoArray, dojoLang, dojoText, dojoHtml, dojoEvent<% if (options.jquery) { %>, _jQuery<% } %><% if (options.templates) { %>, widgetTemplate<% } %>) {
"use strict";
<% if (options.jquery) { %>
var $ = _jQuery.noConflict(true);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-mendix",
"version": "2.0.0",
"version": "2.0.1",
"description": "Mendix Widget generator",
"license": "MIT",
"main": "app/index.js",
Expand Down
2 changes: 1 addition & 1 deletion test/lib/testrunner-empty-boilerplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ module.exports = function (builder, prompt) {
it (format('Based on input, templates should{0} be required in the widget', (templates ? '' : ' NOT')), function () {
var contents = [
[jsFile, format('dojo/text!{0}/widget/template/{0}.html', [promptOps.widgetName])],
[jsFile, 'dijit/_TemplatedMixin'],
[jsFile, '_TemplatedMixin'],
[jsFile, 'widgetTemplate'],
[jsFile, 'templateString: widgetTemplate'],
[jsFile, 'widgetBase: null,']
Expand Down

0 comments on commit a09b739

Please sign in to comment.