ru.coon 2.6.17 → 2.6.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/package.json +1 -1
- package/src/common/panel/WindowWrap.js +13 -14
- package/src/version.js +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
# Version 2.6.18, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/1c189ec63993901ccd4a8045777a19f485c5c065)
|
|
2
|
+
* ## Fixes
|
|
3
|
+
* <span style='color:red'> windowWrap default size for restore when maximized:true CRM-8393</span> ([8eb4a5], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8eb4a5586089b2cc8581e0d647e20b8955c8b097))
|
|
4
|
+
|
|
5
|
+
* update: CHANGELOG.md ([4e316a], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/4e316ac4c2c96cb4de23ff0dfb73ff4db75ea4ec))
|
|
6
|
+
|
|
1
7
|
# Version 2.6.17, [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/a85820f03c44ab7b35ae02ae88209c435f264807)
|
|
2
8
|
* ## Fixes
|
|
3
9
|
* <span style='color:red'> PrintPdfPlugin.handler call parseProperty on 'string'</span> ([8dec18], [link](http://gitlab-dbr.sigma-it.local/dbr/ru.coon/-/commit/8dec18c777cd4e6f3daf9fb1540726e613639220))
|
package/package.json
CHANGED
|
@@ -37,20 +37,6 @@ Ext.define('Coon.common.panel.WindowWrap', {
|
|
|
37
37
|
|
|
38
38
|
addTool: function(tools) {
|
|
39
39
|
const me = this;
|
|
40
|
-
const isWinMaximized = me.height >= me.maxHeight && me.width >= me.maxWidth;
|
|
41
|
-
|
|
42
|
-
me.maximized = me.maximized || isWinMaximized;
|
|
43
|
-
if (me.items[0] && me.items[0].layout && me.items[0].layout.type && me.items[0].layout === 'border') {
|
|
44
|
-
me.height = me.height || 500;
|
|
45
|
-
me.width = me.width || 800;
|
|
46
|
-
}
|
|
47
|
-
if (!me.height) {
|
|
48
|
-
me.height = me.height > me.maxHeight ? me.maxHeight : me.height;
|
|
49
|
-
}
|
|
50
|
-
if (!me.width) {
|
|
51
|
-
me.width = me.width > me.maxWidth ? me.maxWidth : me.width;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
40
|
me.callParent([tools]);
|
|
55
41
|
|
|
56
42
|
if (me.maximized && !!me.tools.maximize) {
|
|
@@ -70,6 +56,19 @@ Ext.define('Coon.common.panel.WindowWrap', {
|
|
|
70
56
|
const viewPortSize = Ext.getBody().getViewSize();
|
|
71
57
|
this.maxWidth = viewPortSize.width;
|
|
72
58
|
this.maxHeight = viewPortSize.height;
|
|
59
|
+
|
|
60
|
+
const isWinMaximized = this.height >= this.maxHeight && this.width >= this.maxWidth;
|
|
61
|
+
this.maximized = this.maximized || isWinMaximized;
|
|
62
|
+
|
|
63
|
+
if (this.maximized) {
|
|
64
|
+
const defaultRestoreSize = {
|
|
65
|
+
height: 500,
|
|
66
|
+
width: 800,
|
|
67
|
+
};
|
|
68
|
+
this.height = Ext.isEmpty(this.height) ? defaultRestoreSize.height : this.height;
|
|
69
|
+
this.width = Ext.isEmpty(this.width) ? defaultRestoreSize.width : this.width;
|
|
70
|
+
}
|
|
71
|
+
|
|
73
72
|
if (this.alwaysInCenter) {
|
|
74
73
|
this.center();
|
|
75
74
|
}
|
package/src/version.js
CHANGED