Skip to content

Commit 50ab570

Browse files
ecarriouecarriou
committed
Bump 2.5.0
1 parent a5ca9f8 commit 50ab570

23 files changed

+1455
-842
lines changed

‎config.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget android-versionCode="24000" id="com.ecarriou.systemdesignerios" version="2.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget android-versionCode="25000" id="com.ecarriou.systemdesignerios" version="2.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>System Designer</name>
44
<description>
55
System Designer, an IDE for designing systems.
@@ -40,6 +40,6 @@
4040
<plugin name="cordova-plugin-statusbar" spec="^2.4.1" />
4141
<plugin name="cordova-plugin-inappbrowser" spec="^2.0.2" />
4242
<engine name="browser" spec="^5.0.1" />
43-
<engine name="android" spec="^7.0.0" />
4443
<engine name="ios" spec="^4.5.4" />
44+
<engine name="android" spec="^7.1.0" />
4545
</widget>

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "com.ecarriou.systemdesignerios",
3-
"version": "2.4.0",
3+
"version": "2.5.0",
44
"displayName": "System Designer",
55
"cordova": {
66
"platforms": [
77
"browser",
8-
"android",
9-
"ios"
8+
"ios",
9+
"android"
1010
],
1111
"plugins": {
1212
"cordova-plugin-whitelist": {},
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"dependencies": {
19-
"cordova-android": "^7.0.0",
19+
"cordova-android": "^7.1.0",
2020
"cordova-browser": "^5.0.1",
2121
"cordova-ios": "^4.5.4",
2222
"cordova-plugin-inappbrowser": "^2.0.2",

‎plugins/android.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
"files": {}
88
},
99
"installed_plugins": {
10-
"cordova-plugin-whitelist": {
10+
"cordova-plugin-inappbrowser": {
1111
"PACKAGE_NAME": "com.ecarriou.systemdesignerios"
1212
},
13-
"cordova-plugin-wkwebview-engine": {
13+
"cordova-plugin-statusbar": {
1414
"PACKAGE_NAME": "com.ecarriou.systemdesignerios"
1515
},
16-
"cordova-plugin-statusbar": {
16+
"cordova-plugin-whitelist": {
1717
"PACKAGE_NAME": "com.ecarriou.systemdesignerios"
1818
},
19-
"cordova-plugin-inappbrowser": {
19+
"cordova-plugin-wkwebview-engine": {
2020
"PACKAGE_NAME": "com.ecarriou.systemdesignerios"
2121
}
2222
},

‎www/lib/jsPlumb/jsplumb.min.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/lib/prism/prism.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ var _ = _self.Prism = {
361361
}
362362

363363
if(lookbehind) {
364-
lookbehindLength = match[1].length;
364+
lookbehindLength = match[1] ? match[1].length : 0;
365365
}
366366

367367
var from = match.index + lookbehindLength,
@@ -691,7 +691,7 @@ Prism.languages.clike = {
691691
'keyword': /\b(?:if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,
692692
'boolean': /\b(?:true|false)\b/,
693693
'function': /[a-z0-9_]+(?=\()/i,
694-
'number': /\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,
694+
'number': /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:e[+-]?\d+)?/i,
695695
'operator': /--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,
696696
'punctuation': /[{}[\];(),.:]/
697697
};
@@ -703,7 +703,7 @@ Prism.languages.clike = {
703703

704704
Prism.languages.javascript = Prism.languages.extend('clike', {
705705
'keyword': /\b(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,
706-
'number': /\b-?(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|\d*\.?\d+(?:[Ee][+-]?\d+)?|NaN|Infinity)\b/,
706+
'number': /\b(?:0[xX][\dA-Fa-f]+|0[bB][01]+|0[oO][0-7]+|NaN|Infinity)\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
707707
// Allow for all non-ASCII characters (See http://stackoverflow.com/a/2008444)
708708
'function': /[_$a-z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/i,
709709
'operator': /-[-=]?|\+[+=]?|!=?=?|<<?=?|>>?>?=?|=(?:==?|>)?|&[&=]?|\|[|=]?|\*\*?=?|\/=?|~|\^=?|%=?|\?|\.{3}/

‎www/lib/system-runtime/system-runtime.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/scripts/designer-runtime.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@
423423
"_id": "f1c9d810bdf16d0f",
424424
"component": "16d0e138c8170b2",
425425
"state": "start",
426-
"action": "function start() { \n var sysid = '',\n system = '',\n params = '',\n systemID = '';\n \n if (typeof global !== 'undefined' && typeof window === 'undefined') {\n require = require;\n }\n\n window.messages = []; // TODO find better way\n window.lastPage = 'index.html'; // TODO find better way\n \n function _getParams() {\n var result = {},\n urlParams = [],\n system = null;\n\n urlParams = document.location.href.split('?');\n\n if (urlParams.length > 1) {\n urlParams = urlParams[1].split('&');\n urlParams.forEach(function (urlParam) {\n var name = '',\n value = '';\n\n name = urlParam.split('=')[0].trim();\n value = urlParam.split('=')[1].trim();\n\n result[name] = decodeURIComponent(value);\n });\n }\n return result;\n }\n\n // case of cordova \n if (typeof cordova !== 'undefined') {\n params = _getParams();\n system = null;\n\n if (Object.keys(params).length) {\n //system = JSON.parse(params.system);\n //this.require('storage').set(system._id, system);\n lastPage = params.ref;\n }\n\n // add back button\n setTimeout(function () {\n if (!document.getElementById('system-designer-back')) {\n var docFragment = null,\n div = null,\n a = null,\n span = null;\n\n docFragment = document.createDocumentFragment();\n div = document.createElement('div');\n div.setAttribute('id', 'system-designer-back');\n div.setAttribute('style', 'top:5px;left:10px;position:absolute;font-size:18px;font-family:Helvetica,Arial,sans-serif;z-index:999999;background-color:white;');\n\n a = document.createElement('a');\n /* jshint -W107 */\n a.setAttribute('href', 'javascript:systemDesignerBack()');\n /* jshint +W107 */\n a.setAttribute('style', 'text-decoration:none; color:#337AB7;');\n\n span = document.createElement('span');\n span.setAttribute('style', \"font-family: 'Helvetica Neue';\");\n span.textContent = ' < System Designer';\n\n a.appendChild(span);\n div.appendChild(a);\n docFragment.appendChild(div);\n\n document.body.appendChild(docFragment);\n }\n }, 1000);\n }\n\n // get system\n sysid = document.location.href.split('#')[1].split('?')[0].split('/')[0];\n system = this.require('storage').get(sysid);\n delete system.classInfo;\n \n this.require('storage').on('changed', function (obj) {\n if (typeof obj['system-designer-message'] !== 'undefined') {\n $db._Message.insert(obj['system-designer-message'].newValue);\n }\n }, true, true);\n \n this.require('logger').info('loading the system...');\n systemID = $db.importSystem(system);\n this.require('logger').info('the system is loaded');\n\n document.title = system.name;\n \n this.require('logger').level('debug');\n if (this.require(systemID).start) {\n this.require(systemID).start();\n }\n}",
426+
"action": "function start() { \n var sysid = '',\n system = '',\n params = '',\n systemID = '';\n \n if (typeof global !== 'undefined' && typeof window === 'undefined') {\n require = require;\n }\n \n window.messages = []; // TODO find better way\n window.lastPage = 'index.html'; // TODO find better way\n \n function _getParams() {\n var result = {},\n urlParams = [],\n system = null;\n\n urlParams = document.location.href.split('?');\n\n if (urlParams.length > 1) {\n urlParams = urlParams[1].split('&');\n urlParams.forEach(function (urlParam) {\n var name = '',\n value = '';\n\n name = urlParam.split('=')[0].trim();\n value = urlParam.split('=')[1].trim();\n\n result[name] = decodeURIComponent(value);\n });\n }\n return result;\n }\n\n // case of cordova \n if (typeof cordova !== 'undefined') {\n params = _getParams();\n system = null;\n\n if (Object.keys(params).length) {\n //system = JSON.parse(params.system);\n //this.require('storage').set(system._id, system);\n lastPage = params.ref;\n }\n\n // add back button\n setTimeout(function () {\n if (!document.getElementById('system-designer-back')) {\n var docFragment = null,\n div = null,\n a = null,\n span = null;\n\n docFragment = document.createDocumentFragment();\n div = document.createElement('div');\n div.setAttribute('id', 'system-designer-back');\n div.setAttribute('style', 'top:5px;left:10px;position:absolute;font-size:18px;font-family:Helvetica,Arial,sans-serif;z-index:999999;background-color:white;');\n\n a = document.createElement('a');\n /* jshint -W107 */\n a.setAttribute('href', 'javascript:systemDesignerBack()');\n /* jshint +W107 */\n a.setAttribute('style', 'text-decoration:none; color:#337AB7;');\n\n span = document.createElement('span');\n span.setAttribute('style', \"font-family: 'Helvetica Neue';\");\n span.textContent = ' < System Designer';\n\n a.appendChild(span);\n div.appendChild(a);\n docFragment.appendChild(div);\n\n document.body.appendChild(docFragment);\n }\n }, 1000);\n }\n\n // get system\n sysid = document.location.href.split('#')[1].split('?')[0].split('/')[0];\n system = this.require('storage').get(sysid);\n delete system.classInfo;\n \n this.require('storage').on('changed', function (obj) {\n if (typeof obj['system-designer-message'] !== 'undefined') {\n $db._Message.insert(obj['system-designer-message'].newValue);\n }\n }, true, true);\n \n this.require('logger').info('loading the system...');\n systemID = $db.importSystem(system);\n this.require('logger').info('the system is loaded');\n\n document.title = system.name;\n \n this.require('logger').level('debug');\n if (this.require(systemID).start) {\n this.require(systemID).start();\n }\n}",
427427
"useCoreAPI": true,
428428
"core": true
429429
},

0 commit comments

Comments
 (0)