Skip to content

Commit 9f2fd41

Browse files
committed
Bump v2.0.0-rc.6
1 parent c0257f8 commit 9f2fd41

22 files changed

+214
-198
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# system-designer-cordova
2-
System Designer for Cordova.
1+
# System Designer for Cordova
32

43
## Installation
54

config.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="com.ecarriou.systemdesignerios" version="2.0.0" android-versionCode="20000" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget android-versionCode="20000" id="com.ecarriou.systemdesignerios" version="2.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>System Designer</name>
44
<description>
5-
System Designer, an IDE for designing applications driven by the model.
5+
System Designer, an IDE for designing JavaScript applications driven by the model.
66
</description>
77
<author email="[email protected]" href="https://system-designer.github.io">System Designer</author>
88
<preference name="deployment-target" value="10.3" />
9-
<preference name="android-minSdkVersion" value="21" />
9+
<preference name="android-minSdkVersion" value="23" />
1010
<feature name="CDVWKWebViewEngine">
1111
<param name="ios-package" value="CDVWKWebViewEngine" />
1212
</feature>
@@ -35,9 +35,11 @@
3535
<platform name="android">
3636
<preference name="Fullscreen" value="false" />
3737
</platform>
38-
<engine name="browser" spec="~5.0.0" />
39-
<plugin name="cordova-plugin-inappbrowser" spec="~1.7.1" />
40-
<plugin name="cordova-plugin-statusbar" spec="~2.2.3" />
41-
<plugin name="cordova-plugin-whitelist" spec="~1.3.2" />
42-
<plugin name="cordova-plugin-wkwebview-engine" spec="~1.1.3" />
38+
<engine name="android" spec="^6.2.3" />
39+
<engine name="browser" spec="^5.0.0" />
40+
<engine name="ios" spec="^4.5.0" />
41+
<plugin name="cordova-plugin-inappbrowser" spec="^1.7.1" />
42+
<plugin name="cordova-plugin-statusbar" spec="^2.2.3" />
43+
<plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
44+
<plugin name="cordova-plugin-wkwebview-engine" spec="^1.1.3" />
4345
</widget>

merges/android/styles/mobile.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ body {
7676

7777
/* small screens */
7878
@media only screen
79-
and (max-width : 650px)
79+
and (max-width : 750px)
8080
and (orientation: landscape) {
8181
body {
8282
font-size: 12px!important;

merges/ios/styles/mobile.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,19 @@ span.glyphicon.glyphicon-menu-left {
106106
#designer-toolbar-item-extension {
107107
display: none;
108108
}
109+
}
110+
111+
/* iPhone 6+ / 7+ / ... */
112+
@media only screen
113+
and (max-width : 736px)
114+
and (orientation : landscape) {
115+
.list-group.designer-library {
116+
max-height:150px;
117+
}
118+
#designer-toolbar-item-search {
119+
display: none;
120+
}
121+
#designer-toolbar-item-extension {
122+
display: none;
123+
}
109124
}

package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"name": "com.ecarriou.systemdesignerios",
3-
"version": "2.0.0",
4-
"displayName": "System Designer",
5-
"cordova": {
6-
"platforms": [
7-
"android",
8-
"browser",
9-
"ios"
10-
],
11-
"plugins": {
12-
"cordova-plugin-inappbrowser": {},
13-
"cordova-plugin-statusbar": {},
14-
"cordova-plugin-whitelist": {},
15-
"cordova-plugin-wkwebview-engine": {}
2+
"name": "com.ecarriou.systemdesignerios",
3+
"version": "2.0.0",
4+
"displayName": "System Designer",
5+
"cordova": {
6+
"platforms": [
7+
"android",
8+
"browser",
9+
"ios"
10+
],
11+
"plugins": {
12+
"cordova-plugin-inappbrowser": {},
13+
"cordova-plugin-statusbar": {},
14+
"cordova-plugin-whitelist": {},
15+
"cordova-plugin-wkwebview-engine": {}
16+
}
17+
},
18+
"dependencies": {
19+
"cordova-android": "^6.2.3",
20+
"cordova-browser": "^5.0.0",
21+
"cordova-ios": "^4.5.0",
22+
"cordova-plugin-inappbrowser": "^1.7.1",
23+
"cordova-plugin-statusbar": "^2.2.3",
24+
"cordova-plugin-whitelist": "^1.3.2",
25+
"cordova-plugin-wkwebview-engine": "^1.1.3"
1626
}
17-
},
18-
"dependencies": {
19-
"cordova-android": "^6.2.3",
20-
"cordova-browser": "^4.1.0",
21-
"cordova-ios": "^4.4.0",
22-
"cordova-plugin-inappbrowser": "^1.7.1",
23-
"cordova-plugin-statusbar": "^2.2.3",
24-
"cordova-plugin-whitelist": "^1.3.2",
25-
"cordova-plugin-wkwebview-engine": "^1.1.3"
26-
}
2727
}

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 global.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 global.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)