Skip to content

Commit 2d7d6f1

Browse files
ecarriouecarriou
committed
Bump v2.0.0-rc.5
1 parent 5f16797 commit 2d7d6f1

File tree

87 files changed

+147350
-5007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+147350
-5007
lines changed

‎config.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="com.ecarriou.systemdesignerios" version="1.9.9" android-versionCode="19900" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
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">
33
<name>System Designer</name>
44
<description>
55
System Designer, an IDE for designing applications driven by the model.
66
</description>
77
<author email="[email protected]" href="https://system-designer.github.io">System Designer</author>
8-
<preference name="deployment-target" value="9.0" />
8+
<preference name="deployment-target" value="10.3" />
99
<preference name="android-minSdkVersion" value="21" />
1010
<feature name="CDVWKWebViewEngine">
1111
<param name="ios-package" value="CDVWKWebViewEngine" />
@@ -35,8 +35,9 @@
3535
<platform name="android">
3636
<preference name="Fullscreen" value="false" />
3737
</platform>
38-
<plugin name="cordova-plugin-inappbrowser" spec="~1.7.0" />
39-
<plugin name="cordova-plugin-statusbar" spec="~2.2.2" />
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" />
4041
<plugin name="cordova-plugin-whitelist" spec="~1.3.2" />
41-
<plugin name="cordova-plugin-wkwebview-engine" spec="~1.1.2" />
42+
<plugin name="cordova-plugin-wkwebview-engine" spec="~1.1.3" />
4243
</widget>

‎merges/android/scripts/cordova.min.js‎ renamed to ‎merges/android/scripts/cordova.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020

2121
/** back **/
2222
function systemDesignerBack() {
23-
var mess = typeof messages !== 'undefined' ? messages : runtime.require('designer').messages(),
24-
ref = typeof lastPage !== 'undefined' ? lastPage : runtime.require('designer').lastPage();
23+
var mess = typeof messages !== 'undefined' ? messages : runtime.require('state').messages(),
24+
ref = typeof lastPage !== 'undefined' ? lastPage : runtime.require('state').lastPage();
2525

26+
if (document.location.href.indexOf('/app/') !== -1) {
27+
document.location.href = '../' + ref + '?messages=' + encodeURIComponent(JSON.stringify(mess));
28+
} else {
2629
document.location.href = ref + '?messages=' + encodeURIComponent(JSON.stringify(mess));
30+
}
2731
}

‎merges/android/styles/cordova.css‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
/*
2+
* System Designer
3+
*
4+
* https://designfirst.io/systemdesigner/
5+
*
6+
* Copyright 2017 Erwan Carriou
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License");
9+
* you may not use this file except in compliance with the License.
10+
* You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS,
16+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
* See the License for the specific language governing permissions and
18+
* limitations under the License.
19+
*/
20+
21+
.designer-system-menu-export {
22+
display: none!important;
23+
}
24+
.designer-schema-menu-export {
25+
display: none!important;
26+
}
27+
.designer-model-menu-export {
28+
display: none!important;
29+
}
30+
.designer-type-menu-export {
31+
display: none!important;
32+
}
33+
.designer-component-menu-export {
34+
display: none!important;
35+
}
36+
.designer-behavior-menu-export {
37+
display: none!important;
38+
}
39+
#designer-dialog-config-client-type-debugging {
40+
display: none!important;
41+
}
42+
#designer-dialog-config-client-form {
43+
display: none!important;
44+
}
45+
#designer-dialog-config-server-form {
46+
display: none!important;
47+
}
48+
body,
49+
.navbar-fixed-top,
50+
.navbar-fixed-bottom {
51+
min-width: 650px!important;
52+
}
53+
html {
54+
background-color: transparent!important;
55+
}
56+
body {
57+
background-color: transparent!important;
58+
}
59+
#designer-dialog-import-modal-type-import {
60+
display: none;
61+
}
62+
#designer-dialog-import-modal-from-file-form {
63+
display: none;
64+
}
65+
#designer-dialog-config-advanced-mode {
66+
display: none;
67+
}
68+
#designer-dialog-import-modal-from-file-input {
69+
display: none;
70+
}
71+
72+
/* override */
73+
.dropdown-menu-right .btn .glyphicon-remove {
74+
top: 3px!important;
75+
}
76+
77+
/* small screens */
78+
@media only screen
79+
and (max-width : 650px)
80+
and (orientation: landscape) {
81+
body {
82+
font-size: 12px!important;
83+
}
84+
.btn-group-lg>.btn, .btn-lg {
85+
padding-top: 6px!important;
86+
}
87+
body,
88+
.navbar-fixed-top,
89+
.navbar-fixed-bottom {
90+
min-width: 600px!important;
91+
}
92+
.list-group.designer-library {
93+
max-height:150px;
94+
}
95+
#designer-toolbar-item-search {
96+
display: none;
97+
}
98+
#designer-toolbar-item-extension {
99+
display: none;
100+
}
101+
}

‎merges/android/styles/cordova.min.css‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎merges/browser/scripts/cordova.js‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* System Designer
3+
*
4+
* https://designfirst.io/systemdesigner/
5+
*
6+
* Copyright 2017 Erwan Carriou
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License");
9+
* you may not use this file except in compliance with the License.
10+
* You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS,
16+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
* See the License for the specific language governing permissions and
18+
* limitations under the License.
19+
*/
20+
21+
document.addEventListener('deviceready', onDeviceReady, false);
22+
function onDeviceReady() {
23+
StatusBar.hide();
24+
}
25+
26+
document.addEventListener('menubutton', onMenuButton, false);
27+
function onMenuButton() {
28+
if (document.location.href.indexOf('/app/') !== -1) {
29+
document.location.href = 'index.html?messages=' + encodeURIComponent(JSON.stringify(mess));
30+
} else {
31+
document.location.href = '../index.html?messages=' + encodeURIComponent(JSON.stringify(mess));
32+
}
33+
}
34+
35+
document.addEventListener('backbutton', systemDesignerBack, false);
36+
function systemDesignerBack() {
37+
var mess = typeof messages !== 'undefined' ? messages : runtime.require('state').messages(),
38+
ref = typeof lastPage !== 'undefined' ? lastPage : runtime.require('state').lastPage();
39+
40+
if (document.location.href.indexOf('/app/') !== -1) {
41+
document.location.href = '../' + ref + '?messages=' + encodeURIComponent(JSON.stringify(mess));
42+
} else {
43+
document.location.href = ref + '?messages=' + encodeURIComponent(JSON.stringify(mess));
44+
}
45+
}

‎merges/browser/styles/cordova.css‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/*
2+
* System Designer
3+
*
4+
* https://designfirst.io/systemdesigner/
5+
*
6+
* Copyright 2017 Erwan Carriou
7+
*
8+
* Licensed under the Apache License, Version 2.0 (the "License");
9+
* you may not use this file except in compliance with the License.
10+
* You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS,
16+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
* See the License for the specific language governing permissions and
18+
* limitations under the License.
19+
*/
20+
21+
.designer-system-menu-export {
22+
display: none!important;
23+
}
24+
.designer-schema-menu-export {
25+
display: none!important;
26+
}
27+
.designer-model-menu-export {
28+
display: none!important;
29+
}
30+
.designer-type-menu-export {
31+
display: none!important;
32+
}
33+
.designer-component-menu-export {
34+
display: none!important;
35+
}
36+
.designer-behavior-menu-export {
37+
display: none!important;
38+
}
39+
#designer-dialog-config-client-type-debugging {
40+
display: none!important;
41+
}
42+
#designer-dialog-config-client-form {
43+
display: none!important;
44+
}
45+
#designer-dialog-config-server-form {
46+
display: none!important;
47+
}
48+
body,
49+
.navbar-fixed-top,
50+
.navbar-fixed-bottom {
51+
min-width: 650px!important;
52+
}
53+
html {
54+
background-color: transparent!important;
55+
}
56+
body {
57+
background-color: transparent!important;
58+
}
59+
#designer-dialog-import-modal-from-file-input {
60+
display: none;
61+
}
62+
#designer-dialog-import-modal-from-file-form {
63+
display: none;
64+
}
65+
#designer-dialog-config-advanced-mode {
66+
display: none;
67+
}
68+
span.glyphicon.glyphicon-menu-left {
69+
color:#337ab7!important;
70+
}

0 commit comments

Comments
 (0)