Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
4d912537
Commit
4d912537
authored
Aug 04, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update plugin window resizing.
parent
bf5a2379
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
24 deletions
+10
-24
apps/common/main/lib/controller/Plugins.js
apps/common/main/lib/controller/Plugins.js
+6
-12
apps/common/main/lib/model/Plugin.js
apps/common/main/lib/model/Plugin.js
+1
-3
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+1
-3
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-3
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+1
-3
No files found.
apps/common/main/lib/controller/Plugins.js
View file @
4d912537
...
...
@@ -136,8 +136,6 @@ define([
variation
.
set_UpdateOleOnResize
(
itemVar
.
get
(
'
isUpdateOleOnResize
'
));
variation
.
set_Buttons
(
itemVar
.
get
(
'
buttons
'
));
variation
.
set_Size
(
itemVar
.
get
(
'
size
'
));
variation
.
set_MaximumSize
(
itemVar
.
get
(
'
maximumSize
'
));
variation
.
set_MinimumSize
(
itemVar
.
get
(
'
minimumSize
'
));
variationsArr
.
push
(
variation
);
});
plugin
.
set_Variations
(
variationsArr
);
...
...
@@ -226,9 +224,7 @@ define([
var
me
=
this
,
arrBtns
=
variation
.
get_Buttons
(),
newBtns
=
{},
size
=
variation
.
get_Size
(),
maxsize
=
variation
.
get_MaximumSize
(),
minsize
=
variation
.
get_MinimumSize
();
size
=
variation
.
get_Size
();
if
(
!
size
||
size
.
length
<
2
)
size
=
[
800
,
600
];
if
(
_
.
isArray
(
arrBtns
))
{
...
...
@@ -244,11 +240,7 @@ define([
height
:
size
[
1
],
// inner height
url
:
_baseUrl
+
variation
.
get_Url
(),
buttons
:
newBtns
,
toolcallback
:
_
.
bind
(
this
.
onToolClose
,
this
),
maxwidth
:
maxsize
[
0
],
maxheight
:
maxsize
[
1
],
minwidth
:
minsize
[
0
],
minheight
:
minsize
[
1
]
toolcallback
:
_
.
bind
(
this
.
onToolClose
,
this
)
});
me
.
pluginDlg
.
on
(
'
render:after
'
,
function
(
obj
){
obj
.
getChild
(
'
.footer .dlg-btn
'
).
on
(
'
click
'
,
_
.
bind
(
me
.
onDlgBtnClick
,
me
));
...
...
@@ -275,9 +267,11 @@ define([
this
.
panelPlugins
.
closeNotVisualMode
();
},
onPluginResize
:
function
(
width
,
height
,
callback
)
{
onPluginResize
:
function
(
size
,
minSize
,
maxSize
,
callback
)
{
if
(
this
.
pluginDlg
)
{
this
.
pluginDlg
.
setInnerSize
(
width
,
height
);
var
resizable
=
(
minSize
&&
minSize
.
length
>
1
&&
maxSize
&&
maxSize
.
length
>
1
&&
(
maxSize
[
0
]
>
minSize
[
0
]
||
maxSize
[
1
]
>
minSize
[
1
]
||
maxSize
[
0
]
==
0
||
maxSize
[
1
]
==
0
));
this
.
pluginDlg
.
setResizable
(
resizable
,
minSize
,
maxSize
);
this
.
pluginDlg
.
setInnerSize
(
size
[
0
],
size
[
1
]);
if
(
callback
)
callback
.
call
();
}
...
...
apps/common/main/lib/model/Plugin.js
View file @
4d912537
...
...
@@ -64,9 +64,7 @@ define([
initData
:
""
,
isUpdateOleOnResize
:
false
,
buttons
:
[],
size
:
[
800
,
600
],
maximumSize
:
[],
minimumSize
:
[]
size
:
[
800
,
600
]
}
}
});
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
4d912537
...
...
@@ -1727,9 +1727,7 @@ define([
initData
:
itemVar
.
initData
,
isUpdateOleOnResize
:
itemVar
.
isUpdateOleOnResize
,
buttons
:
itemVar
.
buttons
,
size
:
itemVar
.
size
,
minimumSize
:
itemVar
.
minimumSize
,
maximumSize
:
itemVar
.
maximumSize
size
:
itemVar
.
size
}));
});
if
(
variationsArr
.
length
>
0
)
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
4d912537
...
...
@@ -1513,9 +1513,7 @@ define([
initData
:
itemVar
.
initData
,
isUpdateOleOnResize
:
itemVar
.
isUpdateOleOnResize
,
buttons
:
itemVar
.
buttons
,
size
:
itemVar
.
size
,
minimumSize
:
itemVar
.
minimumSize
,
maximumSize
:
itemVar
.
maximumSize
size
:
itemVar
.
size
}));
});
if
(
variationsArr
.
length
>
0
)
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
4d912537
...
...
@@ -1722,9 +1722,7 @@ define([
initData
:
itemVar
.
initData
,
isUpdateOleOnResize
:
itemVar
.
isUpdateOleOnResize
,
buttons
:
itemVar
.
buttons
,
size
:
itemVar
.
size
,
minimumSize
:
itemVar
.
minimumSize
,
maximumSize
:
itemVar
.
maximumSize
size
:
itemVar
.
size
}));
});
if
(
variationsArr
.
length
>
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment