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
229d7110
Commit
229d7110
authored
May 18, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE] Отладка панели с плагинами.
parent
f45b7de7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
10 deletions
+24
-10
apps/common/main/lib/view/Plugins.js
apps/common/main/lib/view/Plugins.js
+3
-2
apps/common/main/resources/less/plugins.less
apps/common/main/resources/less/plugins.less
+11
-3
apps/documenteditor/main/app/controller/LeftMenu.js
apps/documenteditor/main/app/controller/LeftMenu.js
+5
-2
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+3
-2
apps/documenteditor/main/app/template/LeftMenu.template
apps/documenteditor/main/app/template/LeftMenu.template
+1
-1
apps/documenteditor/main/app/view/LeftMenu.js
apps/documenteditor/main/app/view/LeftMenu.js
+1
-0
No files found.
apps/common/main/lib/view/Plugins.js
View file @
229d7110
...
...
@@ -44,7 +44,8 @@ Common.Views = Common.Views || {};
define
([
'
common/main/lib/util/utils
'
,
'
common/main/lib/component/BaseView
'
,
'
common/main/lib/component/Layout
'
'
common/main/lib/component/Layout
'
,
'
common/main/lib/component/Window
'
],
function
(
template
)
{
'
use strict
'
;
...
...
@@ -54,7 +55,7 @@ define([
storePlugins
:
undefined
,
template
:
_
.
template
([
'
<div id="plugins-box" class="layout-ct vbox">
'
,
'
<label
style="font-weight: bold;
"><%= scope.strPlugins %></label>
'
,
'
<label
id="plugins-header
"><%= scope.strPlugins %></label>
'
,
'
<div id="plugins-list" class="">
'
,
'
</div>
'
,
'
</div>
'
...
...
apps/common/main/resources/less/plugins.less
View file @
229d7110
#plugins-box {
display: table;
position: relative;
width: 100%;
height: 100%;
margin: 10px;
#plugins-header {
position: absolute;
height: 20px;
left: 0;
top: 0;
font-weight: bold;
margin-top: 10px;
margin-left: 12px;
}
#plugins-list {
height: 100%;
overflow: hidden;
padding
-top:
10px;
padding
: 30px 0 10px
10px;
.item-plugins {
width: 40px;
...
...
apps/documenteditor/main/app/controller/LeftMenu.js
View file @
229d7110
...
...
@@ -174,9 +174,10 @@ define([
if
(
this
.
mode
.
canUseHistory
)
this
.
leftMenu
.
setOptionsPanel
(
'
history
'
,
this
.
getApplication
().
getController
(
'
Common.Controllers.History
'
).
getView
(
'
Common.Views.History
'
));
if
(
this
.
mode
.
canPlugins
)
if
(
this
.
mode
.
canPlugins
)
{
this
.
leftMenu
.
btnPlugins
.
show
();
this
.
leftMenu
.
setOptionsPanel
(
'
plugins
'
,
this
.
getApplication
().
getController
(
'
Common.Controllers.Plugins
'
).
getView
(
'
Common.Views.Plugins
'
));
else
}
else
this
.
leftMenu
.
btnPlugins
.
hide
();
Common
.
util
.
Shortcuts
.
resumeEvents
();
...
...
@@ -442,6 +443,7 @@ define([
this
.
leftMenu
.
btnComments
.
setDisabled
(
true
);
this
.
leftMenu
.
btnChat
.
setDisabled
(
true
);
/** coauthoring end **/
this
.
leftMenu
.
btnPlugins
.
setDisabled
(
true
);
this
.
leftMenu
.
getMenu
(
'
file
'
).
setMode
({
isDisconnected
:
true
});
if
(
this
.
dlgSearch
)
{
...
...
@@ -458,6 +460,7 @@ define([
this
.
leftMenu
.
btnComments
.
setDisabled
(
disable
);
this
.
leftMenu
.
btnChat
.
setDisabled
(
disable
);
/** coauthoring end **/
this
.
leftMenu
.
btnPlugins
.
setDisabled
(
disable
);
if
(
disableFileMenu
)
this
.
leftMenu
.
getMenu
(
'
file
'
).
SetDisabled
(
disable
);
},
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
229d7110
...
...
@@ -1010,6 +1010,9 @@ define([
var
translateArt
=
new
Asc
.
asc_TextArtTranslate
();
translateArt
.
asc_setDefaultText
(
this
.
txtArt
);
this
.
api
.
asc_setTextArtTranslate
(
translateArt
);
if
(
this
.
appOptions
.
canPlugins
)
this
.
updatePluginsList
();
}
},
...
...
@@ -1088,8 +1091,6 @@ define([
// Message on window close
window
.
onbeforeunload
=
_
.
bind
(
me
.
onBeforeUnload
,
me
);
window
.
onunload
=
_
.
bind
(
me
.
onUnload
,
me
);
me
.
updatePluginsList
();
}
},
...
...
apps/documenteditor/main/app/template/LeftMenu.template
View file @
229d7110
...
...
@@ -15,6 +15,6 @@
<div id="left-panel-comments" class="" style="display: none;" />
<div id="left-panel-chat" class="" style="display: none;" />
<!-- /** coauthoring end **/ -->
<div id="left-panel-plugins" class="" style="display: none;" />
<div id="left-panel-plugins" class="" style="display: none;
height: 100%;
" />
</div>
</div>
\ No newline at end of file
apps/documenteditor/main/app/view/LeftMenu.js
View file @
229d7110
...
...
@@ -151,6 +151,7 @@ define([
this
.
btnComments
.
hide
();
this
.
btnChat
.
hide
();
this
.
btnPlugins
.
hide
();
this
.
btnComments
.
on
(
'
click
'
,
_
.
bind
(
this
.
onBtnMenuClick
,
this
));
this
.
btnChat
.
on
(
'
click
'
,
_
.
bind
(
this
.
onBtnMenuClick
,
this
));
...
...
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