Skip to content

Commit f6f7c98

Browse files
author
Jelte Lagendijk
committed
#4 Fix MX 6 deprecations
1 parent 6f83b54 commit f6f7c98

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "FileDocumentViewer",
3-
"version": "1.7.0",
3+
"version": "2.1.0",
44
"description": "This widget lets you view file documents.",
55
"private": true,
66
"dependencies": {},

src/FileDocumentViewer/widget/FileDocumentViewer.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// Required module list. Remove unnecessary modules, you can always get them back from the boilerplate.
66
require( [
7+
'require', // require.toUrl
78
'dojo/_base/declare',
89
'mxui/widget/_WidgetBase',
910
'dijit/_TemplatedMixin',
@@ -17,7 +18,7 @@ require( [
1718
'dojo/_base/lang',
1819
'dojo/text',
1920
'dojo/text!FileDocumentViewer/widget/templates/FileDocumentViewer.html'
20-
], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, domQuery, domClass, domAttr, domConstruct, domStyle, lang, text, widgetTemplate) {
21+
], function (require, declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, domQuery, domClass, domAttr, domConstruct, domStyle, lang, text, widgetTemplate) {
2122
'use strict';
2223

2324
// Declare widget's prototype.
@@ -72,18 +73,18 @@ require( [
7273

7374
callback();
7475
},
75-
76+
7677
_updateRendering: function () {
77-
78+
7879
domConstruct.destroy('iframeNode');
7980
this.iframeNode = null;
8081
this._iframeNodeCreate();
81-
82-
if (this._contextObj && this._contextObj.getAttribute('HasContents')) {
82+
83+
if (this._contextObj && this._contextObj.get('HasContents')) {
8384
domAttr.set(this.iframeNode, 'src', this._getFileUrl());
8485
domAttr.set(this.headerTextNode, 'innerHTML',this._contextObj.get(this.headertitle));
8586
} else {
86-
domAttr.set(this.iframeNode, 'src', mx.moduleUrl('FileDocumentViewer.widget', 'ui/blank.html'));
87+
domAttr.set(this.iframeNode, 'src', require.toUrl('FileDocumentViewer/widget/ui/blank.html'))
8788
domAttr.set(this.headerTextNode, 'innerHTML','...');
8889
}
8990
},
@@ -110,10 +111,10 @@ require( [
110111

111112
_getFileUrl : function() {
112113
var url;
113-
if (this._contextObj === null || this._contextObj.getAttribute('Name') === null) {
114-
url = mx.moduleUrl('FileDocumentViewer.widget', 'ui/error.html');
114+
if (this._contextObj === null || this._contextObj.get('Name') === null) {
115+
url = require.toUrl('FileDocumentViewer/widget/ui/error.html');
115116
} else {
116-
url = 'file?target=window&guid=' + this._contextObj.getGUID() + '&csrfToken=' + mx.session.getCSRFToken() + '&time=' + Date.now();
117+
url = 'file?target=window&guid=' + this._contextObj.getGuid() + '&csrfToken=' + mx.session.getCSRFToken() + '&time=' + Date.now();
117118
}
118119
return url;
119120
},

src/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<package xmlns="http://www.mendix.com/package/1.0/">
3-
<clientModule name="FileDocumentViewer" version="2.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
3+
<clientModule name="FileDocumentViewer" version="2.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
44
<widgetFiles>
55
<widgetFile path="FileDocumentViewer/FileDocumentViewer.xml"/>
66
</widgetFiles>

test/[Test] DocumentViewer.mpr

8 KB
Binary file not shown.
-4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)