Skip to content

Commit

Permalink
4.0.3
Browse files Browse the repository at this point in the history 
mxui.dom. functions replaced with domConstruct.create
Csrftoken (Thanks Jelte)
  • Loading branch information
@ChrisdeG
ChrisdeG committed Mar 8, 2018
1 parent ac9e024 commit 927d3cc
Show file tree
Hide file tree
Showing 23 changed files with 849 additions and 219 deletions.
93 changes: 43 additions & 50 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2016-07-14 using generator-mendix 1.3.6 :: git+https://github.com/mendix/generator-mendix.git
// Generated on 2018-03-08 using generator-mendix 2.0.4 :: git+https://github.com/mendix/generator-mendix.git
/*jshint -W069*/
/*global module*/
"use strict";
Expand All @@ -13,18 +13,18 @@ var MODELER_ARGS = "/file:{path}";
********************************************************************************/

var path = require("path"),
mendixApp = require("node-mendix-modeler-path"),
base64 = require("node-base64-image"),
semver = require("semver"),
xml2js = require("xml2js"),
parser = new xml2js.Parser(),
builder = new xml2js.Builder({
renderOpts: {pretty: true, indent: " ", newline: "\n"},
xmldec: {standalone: null, encoding: "utf-8"}
}),
shelljs = require("shelljs"),
pkg = require("./package.json"),
currentFolder = shelljs.pwd().toString();
mendixApp = require("node-mendix-modeler-path"),
base64 = require("node-base64-image"),
semver = require("semver"),
xml2js = require("xml2js"),
parser = new xml2js.Parser(),
builder = new xml2js.Builder({
renderOpts: { pretty: true, indent: " ", newline: "\n" },
xmldec: { standalone: null, encoding: "utf-8" }
}),
shelljs = require("shelljs"),
pkg = require("./package.json"),
currentFolder = shelljs.pwd().toString();

var TEST_PATH = path.join(currentFolder, "/test/Test.mpr");
var WIDGET_XML = path.join(currentFolder, "/src/", pkg.name, "/", pkg.name + ".xml");
Expand Down Expand Up @@ -55,8 +55,8 @@ module.exports = function (grunt) {
grunt.initConfig({
watch: {
autoDeployUpdate: {
"files": ["./src/**/*"],
"tasks": ["compress", "newer:copy"],
"files": [ "./src/**/*" ],
"tasks": [ "compress", "newer:copy" ],
options: {
debounceDelay: 250,
livereload: true
Expand All @@ -69,24 +69,24 @@ module.exports = function (grunt) {
archive: "./dist/" + pkg.name + ".mpk",
mode: "zip"
},
files: [{
expand: true,
date: new Date(),
store: false,
cwd: "./src",
src: ["**/*"]
}]
files: [{
expand: true,
date: new Date(),
store: false,
cwd: "./src",
src: ["**/*"]
}]
}
},
copy: {
deployment: {
files: [
{dest: TEST_WIDGETS_DEPLOYMENT_FOLDER, cwd: "./src/", src: ["**/*"], expand: true}
{ dest: TEST_WIDGETS_DEPLOYMENT_FOLDER, cwd: "./src/", src: ["**/*"], expand: true }
]
},
mpks: {
files: [
{dest: TEST_WIDGETS_FOLDER, cwd: "./dist/", src: [pkg.name + ".mpk"], expand: true}
{ dest: TEST_WIDGETS_FOLDER, cwd: "./dist/", src: [ pkg.name + ".mpk"], expand: true }
]
}
},
Expand All @@ -97,16 +97,10 @@ module.exports = function (grunt) {
},
csslint: {
strict: {
options: {
import: 2
},
src: ["src/" + pkg.name + "/widget/ui/*.css"]
}
},
jsdoc2md: {
oneOutputFile: {
src: "src/" + pkg.name + "/widget/" + pkg.name + ".js",
dest: "doc/documentation.md"
options: {
import: 2
},
src: ["src/" + pkg.name + "/widget/ui/*.css"]
}
}
});
Expand All @@ -117,7 +111,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-contrib-copy");
grunt.loadNpmTasks("grunt-newer");
grunt.loadNpmTasks("grunt-contrib-csslint");
grunt.loadNpmTasks('grunt-jsdoc-to-markdown');

grunt.registerTask("start-modeler", function () {
var done = this.async();
Expand Down Expand Up @@ -178,10 +171,10 @@ module.exports = function (grunt) {

grunt.registerTask("generate-icon", function () {
var iconPath = path.join(currentFolder, "/icon.png"),
options = {localFile: true, string: true},
done = this.async();
options = {localFile: true, string: true},
done = this.async();

grunt.log.writeln("Processing icon");
grunt.log.writeln("Processing icon");

if (!grunt.file.exists(iconPath) || !grunt.file.exists(WIDGET_XML)) {
grunt.log.error("can\'t generate icon");
Expand Down Expand Up @@ -219,22 +212,22 @@ module.exports = function (grunt) {
return done();
});

grunt.registerTask("start-mendix", ["start-modeler"]);
grunt.registerTask("start-mendix", [ "start-modeler" ]);

grunt.registerTask(
"default",
"Watches for changes and automatically creates an MPK file, as well as copying the changes to your deployment folder",
["watch"]
);
"default",
"Watches for changes and automatically creates an MPK file, as well as copying the changes to your deployment folder",
[ "watch" ]
);

grunt.registerTask(
"clean build",
"Compiles all the assets and copies the files to the build directory.",
["clean", "compress", "copy"]
);
"clean build",
"Compiles all the assets and copies the files to the build directory.",
[ "clean", "compress", "copy" ]
);

grunt.registerTask(
"build",
["clean build"]
);
"build",
[ "clean build" ]
);
};
2 changes: 1 addition & 1 deletion dev/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="javasource"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/Program Files/Mendix/7.0.2/runtime/bundles/biz.aQute.bnd.bndlib.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.0.2/runtime/bundles/com.mendix.json.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.0.2/runtime/bundles/com.mendix.logging-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.0.2/runtime/bundles/com.mendix.m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.0.2/runtime/bundles/com.mendix.public-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.0.2/runtime/bundles/javax.servlet.jar"/>
<classpathentry kind="lib" path="C:/Program Files/Mendix/7.12.0/runtime/bundles/biz.aQute.bnd.bndlib.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.12.0/runtime/bundles/com.mendix.json.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.12.0/runtime/bundles/com.mendix.logging-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.12.0/runtime/bundles/com.mendix.m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.12.0/runtime/bundles/com.mendix.public-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/7.12.0/runtime/bundles/javax.servlet-api.servlet.jar"/>

<classpathentry kind="output" path="deployment/run/bin"/>
</classpath>
Binary file modified dev/DropZone5.mpr
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion dev/javasource/administration/proxies/microflows/Microflows.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by Mendix Modeler 7.0.
// This file was generated by Mendix Modeler 7.12.
//
// WARNING: Code you write here will be lost the next time you deploy the project.

Expand Down
1 change: 1 addition & 0 deletions dev/javasource/myfirstmodule/proxies/CustomerImage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public enum MemberNames
DeleteAfterDownload("DeleteAfterDownload"),
Contents("Contents"),
HasContents("HasContents"),
Size("Size"),
CustomerImage_Customer("MyFirstModule.CustomerImage_Customer");

private java.lang.String metaName;
Expand Down
3 changes: 2 additions & 1 deletion dev/javasource/myfirstmodule/proxies/Image.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public enum MemberNames
Name("Name"),
DeleteAfterDownload("DeleteAfterDownload"),
Contents("Contents"),
HasContents("HasContents");
HasContents("HasContents"),
Size("Size");

private java.lang.String metaName;

Expand Down
2 changes: 1 addition & 1 deletion dev/javasource/myfirstmodule/proxies/microflows/Microflows.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by Mendix Modeler 7.0.
// This file was generated by Mendix Modeler 7.12.
//
// WARNING: Code you write here will be lost the next time you deploy the project.

Expand Down
39 changes: 38 additions & 1 deletion dev/javasource/system/proxies/FileDocument.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ public enum MemberNames
Name("Name"),
DeleteAfterDownload("DeleteAfterDownload"),
Contents("Contents"),
HasContents("HasContents");
HasContents("HasContents"),
Size("Size");

private java.lang.String metaName;

Expand Down Expand Up @@ -297,6 +298,42 @@ public final void setHasContents(com.mendix.systemwideinterfaces.core.IContext c
getMendixObject().setValue(context, MemberNames.HasContents.toString(), hascontents);
}

/**
* @return value of Size
*/
public final java.lang.Long getSize()
{
return getSize(getContext());
}

/**
* @param context
* @return value of Size
*/
public final java.lang.Long getSize(com.mendix.systemwideinterfaces.core.IContext context)
{
return (java.lang.Long) getMendixObject().getValue(context, MemberNames.Size.toString());
}

/**
* Set value of Size
* @param size
*/
public final void setSize(java.lang.Long size)
{
setSize(getContext(), size);
}

/**
* Set value of Size
* @param context
* @param size
*/
public final void setSize(com.mendix.systemwideinterfaces.core.IContext context, java.lang.Long size)
{
getMendixObject().setValue(context, MemberNames.Size.toString(), size);
}

/**
* @return the IMendixObject instance of this proxy for use in the Core interface.
*/
Expand Down
12 changes: 6 additions & 6 deletions dev/javasource/system/proxies/HttpHeader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public final void setValue(com.mendix.systemwideinterfaces.core.IContext context
/**
* @return value of HttpHeaders
*/
public final system.proxies.HttpResponse getHttpHeaders() throws com.mendix.core.CoreException
public final system.proxies.HttpMessage getHttpHeaders() throws com.mendix.core.CoreException
{
return getHttpHeaders(getContext());
}
Expand All @@ -193,20 +193,20 @@ public final system.proxies.HttpResponse getHttpHeaders() throws com.mendix.core
* @param context
* @return value of HttpHeaders
*/
public final system.proxies.HttpResponse getHttpHeaders(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException
public final system.proxies.HttpMessage getHttpHeaders(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException
{
system.proxies.HttpResponse result = null;
system.proxies.HttpMessage result = null;
com.mendix.systemwideinterfaces.core.IMendixIdentifier identifier = getMendixObject().getValue(context, MemberNames.HttpHeaders.toString());
if (identifier != null)
result = system.proxies.HttpResponse.load(context, identifier);
result = system.proxies.HttpMessage.load(context, identifier);
return result;
}

/**
* Set value of HttpHeaders
* @param httpheaders
*/
public final void setHttpHeaders(system.proxies.HttpResponse httpheaders)
public final void setHttpHeaders(system.proxies.HttpMessage httpheaders)
{
setHttpHeaders(getContext(), httpheaders);
}
Expand All @@ -216,7 +216,7 @@ public final void setHttpHeaders(system.proxies.HttpResponse httpheaders)
* @param context
* @param httpheaders
*/
public final void setHttpHeaders(com.mendix.systemwideinterfaces.core.IContext context, system.proxies.HttpResponse httpheaders)
public final void setHttpHeaders(com.mendix.systemwideinterfaces.core.IContext context, system.proxies.HttpMessage httpheaders)
{
if (httpheaders == null)
getMendixObject().setValue(context, MemberNames.HttpHeaders.toString(), null);
Expand Down
Loading

0 comments on commit 927d3cc

Please sign in to comment.