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
f8402c07
Commit
f8402c07
authored
Mar 30, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature/sse-table-settings
parents
653d6db3
c377fb54
Changes
21
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
291 additions
and
292 deletions
+291
-292
apps/documenteditor/main/app.js
apps/documenteditor/main/app.js
+2
-2
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+1
-1
apps/documenteditor/main/app/controller/RightMenu.js
apps/documenteditor/main/app/controller/RightMenu.js
+12
-5
apps/documenteditor/main/app/view/DocumentHolder.js
apps/documenteditor/main/app/view/DocumentHolder.js
+3
-0
apps/documenteditor/main/app/view/RightMenu.js
apps/documenteditor/main/app/view/RightMenu.js
+2
-3
apps/documenteditor/main/index.html
apps/documenteditor/main/index.html
+1
-1
apps/presentationeditor/main/app.js
apps/presentationeditor/main/app.js
+2
-2
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+1
-1
apps/presentationeditor/main/app/controller/RightMenu.js
apps/presentationeditor/main/app/controller/RightMenu.js
+9
-5
apps/presentationeditor/main/app/view/DocumentHolder.js
apps/presentationeditor/main/app/view/DocumentHolder.js
+3
-0
apps/presentationeditor/main/app/view/RightMenu.js
apps/presentationeditor/main/app/view/RightMenu.js
+2
-3
apps/presentationeditor/main/index.html
apps/presentationeditor/main/index.html
+1
-1
apps/spreadsheeteditor/main/app.js
apps/spreadsheeteditor/main/app.js
+2
-2
apps/spreadsheeteditor/main/app/controller/RightMenu.js
apps/spreadsheeteditor/main/app/controller/RightMenu.js
+9
-2
apps/spreadsheeteditor/main/app/view/RightMenu.js
apps/spreadsheeteditor/main/app/view/RightMenu.js
+2
-3
apps/spreadsheeteditor/main/index.html
apps/spreadsheeteditor/main/index.html
+1
-1
apps/spreadsheeteditor/main/index.html.deploy
apps/spreadsheeteditor/main/index.html.deploy
+1
-1
build/documenteditor.json
build/documenteditor.json
+79
-83
build/package.json
build/package.json
+1
-1
build/presentationeditor.json
build/presentationeditor.json
+80
-93
build/spreadsheeteditor.json
build/spreadsheeteditor.json
+77
-82
No files found.
apps/documenteditor/main/app.js
View file @
f8402c07
...
@@ -25,8 +25,8 @@ require.config({
...
@@ -25,8 +25,8 @@ require.config({
jszip
:
'
../vendor/jszip/jszip.min
'
,
jszip
:
'
../vendor/jszip/jszip.min
'
,
jsziputils
:
'
../vendor/jszip-utils/jszip-utils.min
'
,
jsziputils
:
'
../vendor/jszip-utils/jszip-utils.min
'
,
jsrsasign
:
'
../vendor/jsrsasign/jsrsasign-latest-all-min
'
,
jsrsasign
:
'
../vendor/jsrsasign/jsrsasign-latest-all-min
'
,
allfonts
:
'
../sdkjs/common/AllFonts
'
,
allfonts
:
'
../
../
sdkjs/common/AllFonts
'
,
sdk
:
'
../sdkjs/word/sdk-all
'
,
sdk
:
'
../
../
sdkjs/word/sdk-all
'
,
api
:
'
api/documents/api
'
,
api
:
'
api/documents/api
'
,
core
:
'
common/main/lib/core/application
'
,
core
:
'
common/main/lib/core/application
'
,
notification
:
'
common/main/lib/core/NotificationCenter
'
,
notification
:
'
common/main/lib/core/NotificationCenter
'
,
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
f8402c07
...
@@ -141,7 +141,7 @@ define([
...
@@ -141,7 +141,7 @@ define([
/*
/*
* TODO: Workaround bug #25004. Clipboard feature processing in sdk.
* TODO: Workaround bug #25004. Clipboard feature processing in sdk.
*/
*/
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
))
{
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
)
&&
!
/area_id/
.
test
(
e
.
target
.
id
)
)
{
me
.
api
.
asc_enableKeyEvents
(
true
);
me
.
api
.
asc_enableKeyEvents
(
true
);
if
(
/msg-reply/
.
test
(
e
.
target
.
className
))
if
(
/msg-reply/
.
test
(
e
.
target
.
className
))
me
.
dontCloseDummyComment
=
false
;
me
.
dontCloseDummyComment
=
false
;
...
...
apps/documenteditor/main/app/controller/RightMenu.js
View file @
f8402c07
...
@@ -72,7 +72,7 @@ define([
...
@@ -72,7 +72,7 @@ define([
this
.
rightmenu
.
fireEvent
(
'
editcomplete
'
,
this
.
rightmenu
);
this
.
rightmenu
.
fireEvent
(
'
editcomplete
'
,
this
.
rightmenu
);
},
},
onFocusObject
:
function
(
SelectedObjects
)
{
onFocusObject
:
function
(
SelectedObjects
,
open
)
{
if
(
!
this
.
editMode
)
if
(
!
this
.
editMode
)
return
;
return
;
...
@@ -158,7 +158,7 @@ define([
...
@@ -158,7 +158,7 @@ define([
if
(
!
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
hidden
)
if
(
!
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
hidden
)
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
panel
.
setLocked
(
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
locked
);
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
panel
.
setLocked
(
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
locked
);
if
(
!
this
.
rightmenu
.
minimizedMode
)
{
if
(
!
this
.
rightmenu
.
minimizedMode
||
open
)
{
var
active
;
var
active
;
if
(
priorityactive
>-
1
)
active
=
priorityactive
;
if
(
priorityactive
>-
1
)
active
=
priorityactive
;
...
@@ -166,8 +166,11 @@ define([
...
@@ -166,8 +166,11 @@ define([
else
if
(
currentactive
>=
0
)
active
=
currentactive
;
else
if
(
currentactive
>=
0
)
active
=
currentactive
;
else
if
(
!
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
hidden
)
active
=
Common
.
Utils
.
documentSettingsType
.
MailMerge
;
else
if
(
!
this
.
_settings
[
Common
.
Utils
.
documentSettingsType
.
MailMerge
].
hidden
)
active
=
Common
.
Utils
.
documentSettingsType
.
MailMerge
;
if
(
active
==
undefined
&&
open
&&
lastactive
>=
0
)
active
=
lastactive
;
if
(
active
!==
undefined
)
{
if
(
active
!==
undefined
)
{
this
.
rightmenu
.
SetActivePane
(
active
);
this
.
rightmenu
.
SetActivePane
(
active
,
open
);
if
(
active
!=
Common
.
Utils
.
documentSettingsType
.
MailMerge
)
if
(
active
!=
Common
.
Utils
.
documentSettingsType
.
MailMerge
)
this
.
_settings
[
active
].
panel
.
ChangeSettings
.
call
(
this
.
_settings
[
active
].
panel
,
this
.
_settings
[
active
].
props
);
this
.
_settings
[
active
].
panel
.
ChangeSettings
.
call
(
this
.
_settings
[
active
].
panel
,
this
.
_settings
[
active
].
props
);
else
else
...
@@ -237,8 +240,12 @@ define([
...
@@ -237,8 +240,12 @@ define([
if
(
this
.
editMode
&&
this
.
api
)
{
if
(
this
.
editMode
&&
this
.
api
)
{
var
selectedElements
=
this
.
api
.
getSelectedElements
();
var
selectedElements
=
this
.
api
.
getSelectedElements
();
if
(
selectedElements
.
length
>
0
)
if
(
selectedElements
.
length
>
0
)
{
this
.
onFocusObject
(
selectedElements
);
var
open
=
Common
.
localStorage
.
getItem
(
"
de-hide-right-settings
"
);
open
=
(
open
===
null
||
parseInt
(
open
)
==
0
);
this
.
onFocusObject
(
selectedElements
,
open
);
}
}
}
},
},
...
...
apps/documenteditor/main/app/view/DocumentHolder.js
View file @
f8402c07
...
@@ -78,6 +78,9 @@ define([
...
@@ -78,6 +78,9 @@ define([
menu
.
alignPosition
();
menu
.
alignPosition
();
}
}
_
.
delay
(
function
()
{
_
.
delay
(
function
()
{
var
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-inputmode
"
);
// only for hieroglyphs mode
if
(
value
!==
null
&&
parseInt
(
value
)
==
1
)
me
.
api
.
asc_enableKeyEvents
(
false
);
menu
.
cmpEl
.
focus
();
menu
.
cmpEl
.
focus
();
},
10
);
},
10
);
...
...
apps/documenteditor/main/app/view/RightMenu.js
View file @
f8402c07
...
@@ -194,7 +194,7 @@ define([
...
@@ -194,7 +194,7 @@ define([
$
(
this
.
el
).
width
(
MENU_SCALE_PART
);
$
(
this
.
el
).
width
(
MENU_SCALE_PART
);
target_pane_parent
.
css
(
"
display
"
,
"
inline-block
"
);
target_pane_parent
.
css
(
"
display
"
,
"
inline-block
"
);
this
.
minimizedMode
=
false
;
this
.
minimizedMode
=
false
;
Common
.
localStorage
.
setItem
(
"
de-hid
den
-right-settings
"
,
0
);
Common
.
localStorage
.
setItem
(
"
de-hid
e
-right-settings
"
,
0
);
}
}
target_pane_parent
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
target_pane_parent
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
target_pane
.
addClass
(
"
active
"
);
target_pane
.
addClass
(
"
active
"
);
...
@@ -206,7 +206,7 @@ define([
...
@@ -206,7 +206,7 @@ define([
target_pane_parent
.
css
(
"
display
"
,
"
none
"
);
target_pane_parent
.
css
(
"
display
"
,
"
none
"
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
this
.
minimizedMode
=
true
;
this
.
minimizedMode
=
true
;
Common
.
localStorage
.
setItem
(
"
de-hid
den
-right-settings
"
,
1
);
Common
.
localStorage
.
setItem
(
"
de-hid
e
-right-settings
"
,
1
);
}
}
this
.
fireEvent
(
'
rightmenuclick
'
,
[
this
,
btn
.
options
.
asctype
,
this
.
minimizedMode
]);
this
.
fireEvent
(
'
rightmenuclick
'
,
[
this
,
btn
.
options
.
asctype
,
this
.
minimizedMode
]);
...
@@ -248,7 +248,6 @@ define([
...
@@ -248,7 +248,6 @@ define([
target_pane
.
css
(
"
display
"
,
"
none
"
);
target_pane
.
css
(
"
display
"
,
"
none
"
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
this
.
minimizedMode
=
true
;
this
.
minimizedMode
=
true
;
Common
.
localStorage
.
setItem
(
"
de-hidden-right-settings
"
,
1
);
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
rightmenu
'
);
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
rightmenu
'
);
},
},
...
...
apps/documenteditor/main/index.html
View file @
f8402c07
...
@@ -354,7 +354,7 @@
...
@@ -354,7 +354,7 @@
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ArcTo.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ArcTo.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/Hit.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/Hit.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ColorArray.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ColorArray.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/
word/Drawing
/Overlay.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/
common
/Overlay.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ShapeDrawer.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ShapeDrawer.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/DrawingDocument.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/DrawingDocument.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/GraphicsEvents.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/GraphicsEvents.js"
></script>
...
...
apps/presentationeditor/main/app.js
View file @
f8402c07
...
@@ -24,8 +24,8 @@ require.config({
...
@@ -24,8 +24,8 @@ require.config({
sockjs
:
'
../vendor/sockjs/sockjs.min
'
,
sockjs
:
'
../vendor/sockjs/sockjs.min
'
,
jsziputils
:
'
../vendor/jszip-utils/jszip-utils.min
'
,
jsziputils
:
'
../vendor/jszip-utils/jszip-utils.min
'
,
jsrsasign
:
'
../vendor/jsrsasign/jsrsasign-latest-all-min
'
,
jsrsasign
:
'
../vendor/jsrsasign/jsrsasign-latest-all-min
'
,
allfonts
:
'
../sdkjs/common/AllFonts
'
,
allfonts
:
'
../
../
sdkjs/common/AllFonts
'
,
sdk
:
'
../sdkjs/slide/sdk-all
'
,
sdk
:
'
../
../
sdkjs/slide/sdk-all
'
,
api
:
'
api/documents/api
'
,
api
:
'
api/documents/api
'
,
core
:
'
common/main/lib/core/application
'
,
core
:
'
common/main/lib/core/application
'
,
notification
:
'
common/main/lib/core/NotificationCenter
'
,
notification
:
'
common/main/lib/core/NotificationCenter
'
,
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
f8402c07
...
@@ -124,7 +124,7 @@ define([
...
@@ -124,7 +124,7 @@ define([
/*
/*
* TODO: Workaround bug #25004. Clipboard feature processing in sdk.
* TODO: Workaround bug #25004. Clipboard feature processing in sdk.
*/
*/
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
))
{
if
(
!
(
Common
.
Utils
.
isSafari
&&
Common
.
Utils
.
isMac
)
&&
!
/area_id/
.
test
(
e
.
target
.
id
)
)
{
me
.
api
.
asc_enableKeyEvents
(
true
);
me
.
api
.
asc_enableKeyEvents
(
true
);
if
(
/msg-reply/
.
test
(
e
.
target
.
className
))
if
(
/msg-reply/
.
test
(
e
.
target
.
className
))
me
.
dontCloseDummyComment
=
false
;
me
.
dontCloseDummyComment
=
false
;
...
...
apps/presentationeditor/main/app/controller/RightMenu.js
View file @
f8402c07
...
@@ -71,7 +71,7 @@ define([
...
@@ -71,7 +71,7 @@ define([
this
.
rightmenu
.
fireEvent
(
'
editcomplete
'
,
this
.
rightmenu
);
this
.
rightmenu
.
fireEvent
(
'
editcomplete
'
,
this
.
rightmenu
);
},
},
onFocusObject
:
function
(
SelectedObjects
)
{
onFocusObject
:
function
(
SelectedObjects
,
open
)
{
if
(
!
this
.
editMode
)
if
(
!
this
.
editMode
)
return
;
return
;
...
@@ -147,7 +147,7 @@ define([
...
@@ -147,7 +147,7 @@ define([
}
}
}
}
if
(
!
this
.
rightmenu
.
minimizedMode
)
{
if
(
!
this
.
rightmenu
.
minimizedMode
||
open
)
{
var
active
;
var
active
;
if
(
priorityactive
>-
1
)
active
=
priorityactive
;
if
(
priorityactive
>-
1
)
active
=
priorityactive
;
...
@@ -156,7 +156,7 @@ define([
...
@@ -156,7 +156,7 @@ define([
else
active
=
Common
.
Utils
.
documentSettingsType
.
Slide
;
else
active
=
Common
.
Utils
.
documentSettingsType
.
Slide
;
if
(
active
!==
undefined
)
{
if
(
active
!==
undefined
)
{
this
.
rightmenu
.
SetActivePane
(
active
);
this
.
rightmenu
.
SetActivePane
(
active
,
open
);
this
.
_settings
[
active
].
panel
.
ChangeSettings
.
call
(
this
.
_settings
[
active
].
panel
,
this
.
_settings
[
active
].
props
);
this
.
_settings
[
active
].
panel
.
ChangeSettings
.
call
(
this
.
_settings
[
active
].
panel
,
this
.
_settings
[
active
].
props
);
}
}
}
}
...
@@ -214,8 +214,12 @@ define([
...
@@ -214,8 +214,12 @@ define([
this
.
api
.
asc_registerCallback
(
'
asc_doubleClickOnObject
'
,
_
.
bind
(
this
.
onDoubleClickOnObject
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_doubleClickOnObject
'
,
_
.
bind
(
this
.
onDoubleClickOnObject
,
this
));
var
selectedElements
=
this
.
api
.
getSelectedElements
();
var
selectedElements
=
this
.
api
.
getSelectedElements
();
if
(
selectedElements
.
length
>
0
)
if
(
selectedElements
.
length
>
0
)
{
this
.
onFocusObject
(
selectedElements
);
var
open
=
Common
.
localStorage
.
getItem
(
"
pe-hide-right-settings
"
);
open
=
(
open
===
null
||
parseInt
(
open
)
==
0
);
this
.
onFocusObject
(
selectedElements
,
open
);
}
}
}
},
},
...
...
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @
f8402c07
...
@@ -69,6 +69,9 @@ define([
...
@@ -69,6 +69,9 @@ define([
menu
.
alignPosition
();
menu
.
alignPosition
();
}
}
_
.
delay
(
function
()
{
_
.
delay
(
function
()
{
var
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-inputmode
"
);
// only for hieroglyphs mode
if
(
value
!==
null
&&
parseInt
(
value
)
==
1
)
me
.
api
.
asc_enableKeyEvents
(
false
);
menu
.
cmpEl
.
focus
();
menu
.
cmpEl
.
focus
();
},
10
);
},
10
);
...
...
apps/presentationeditor/main/app/view/RightMenu.js
View file @
f8402c07
...
@@ -176,7 +176,7 @@ define([
...
@@ -176,7 +176,7 @@ define([
$
(
this
.
el
).
width
(
MENU_SCALE_PART
);
$
(
this
.
el
).
width
(
MENU_SCALE_PART
);
target_pane_parent
.
css
(
"
display
"
,
"
inline-block
"
);
target_pane_parent
.
css
(
"
display
"
,
"
inline-block
"
);
this
.
minimizedMode
=
false
;
this
.
minimizedMode
=
false
;
Common
.
localStorage
.
setItem
(
"
pe-hid
den
-right-settings
"
,
0
);
Common
.
localStorage
.
setItem
(
"
pe-hid
e
-right-settings
"
,
0
);
}
}
target_pane_parent
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
target_pane_parent
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
target_pane
.
addClass
(
"
active
"
);
target_pane
.
addClass
(
"
active
"
);
...
@@ -189,7 +189,7 @@ define([
...
@@ -189,7 +189,7 @@ define([
target_pane_parent
.
css
(
"
display
"
,
"
none
"
);
target_pane_parent
.
css
(
"
display
"
,
"
none
"
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
this
.
minimizedMode
=
true
;
this
.
minimizedMode
=
true
;
Common
.
localStorage
.
setItem
(
"
pe-hid
den
-right-settings
"
,
1
);
Common
.
localStorage
.
setItem
(
"
pe-hid
e
-right-settings
"
,
1
);
}
}
this
.
fireEvent
(
'
rightmenuclick
'
,
[
this
,
btn
.
options
.
asctype
,
this
.
minimizedMode
]);
this
.
fireEvent
(
'
rightmenuclick
'
,
[
this
,
btn
.
options
.
asctype
,
this
.
minimizedMode
]);
...
@@ -245,7 +245,6 @@ define([
...
@@ -245,7 +245,6 @@ define([
target_pane
.
css
(
"
display
"
,
"
none
"
);
target_pane
.
css
(
"
display
"
,
"
none
"
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
this
.
minimizedMode
=
true
;
this
.
minimizedMode
=
true
;
Common
.
localStorage
.
setItem
(
"
pe-hidden-right-settings
"
,
1
);
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
rightmenu
'
);
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
rightmenu
'
);
},
},
...
...
apps/presentationeditor/main/index.html
View file @
f8402c07
...
@@ -306,7 +306,7 @@
...
@@ -306,7 +306,7 @@
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/HatchPattern.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/HatchPattern.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/Graphics.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/Graphics.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/
word/Drawing
/Overlay.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/
common
/Overlay.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ShapeDrawer.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/word/Drawing/ShapeDrawer.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/slide/Drawing/Transitions.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/slide/Drawing/Transitions.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/slide/Drawing/DrawingDocument.js"
></script>
<script
type=
"text/javascript"
src=
"../../../../sdkjs/slide/Drawing/DrawingDocument.js"
></script>
...
...
apps/spreadsheeteditor/main/app.js
View file @
f8402c07
...
@@ -24,8 +24,8 @@ require.config({
...
@@ -24,8 +24,8 @@ require.config({
sockjs
:
'
../vendor/sockjs/sockjs.min
'
,
sockjs
:
'
../vendor/sockjs/sockjs.min
'
,
jsziputils
:
'
../vendor/jszip-utils/jszip-utils.min
'
,
jsziputils
:
'
../vendor/jszip-utils/jszip-utils.min
'
,
jsrsasign
:
'
../vendor/jsrsasign/jsrsasign-latest-all-min
'
,
jsrsasign
:
'
../vendor/jsrsasign/jsrsasign-latest-all-min
'
,
allfonts
:
'
../sdkjs/common/AllFonts
'
,
allfonts
:
'
../
../
sdkjs/common/AllFonts
'
,
sdk
:
'
../sdkjs/cell/sdk-all
'
,
sdk
:
'
../
../
sdkjs/cell/sdk-all
'
,
api
:
'
api/documents/api
'
,
api
:
'
api/documents/api
'
,
core
:
'
common/main/lib/core/application
'
,
core
:
'
common/main/lib/core/application
'
,
notification
:
'
common/main/lib/core/NotificationCenter
'
,
notification
:
'
common/main/lib/core/NotificationCenter
'
,
...
...
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file @
f8402c07
...
@@ -164,16 +164,20 @@ define([
...
@@ -164,16 +164,20 @@ define([
}
}
}
}
if
(
!
this
.
rightmenu
.
minimizedMode
)
{
if
(
!
this
.
rightmenu
.
minimizedMode
||
this
.
_openRightMenu
)
{
var
active
;
var
active
;
if
(
priorityactive
>-
1
)
active
=
priorityactive
;
if
(
priorityactive
>-
1
)
active
=
priorityactive
;
else
if
(
lastactive
>=
0
&&
currentactive
<
0
)
active
=
lastactive
;
else
if
(
lastactive
>=
0
&&
currentactive
<
0
)
active
=
lastactive
;
else
if
(
currentactive
>=
0
)
active
=
currentactive
;
else
if
(
currentactive
>=
0
)
active
=
currentactive
;
if
(
active
==
undefined
&&
this
.
_openRightMenu
&&
lastactive
>=
0
)
active
=
lastactive
;
if
(
active
!==
undefined
)
{
if
(
active
!==
undefined
)
{
this
.
rightmenu
.
SetActivePane
(
active
);
this
.
rightmenu
.
SetActivePane
(
active
,
this
.
_openRightMenu
);
this
.
_settings
[
active
].
panel
.
ChangeSettings
.
call
(
this
.
_settings
[
active
].
panel
,
this
.
_settings
[
active
].
props
);
this
.
_settings
[
active
].
panel
.
ChangeSettings
.
call
(
this
.
_settings
[
active
].
panel
,
this
.
_settings
[
active
].
props
);
this
.
_openRightMenu
=
false
;
}
}
}
}
...
@@ -221,6 +225,9 @@ define([
...
@@ -221,6 +225,9 @@ define([
createDelayedElements
:
function
()
{
createDelayedElements
:
function
()
{
var
me
=
this
;
var
me
=
this
;
if
(
this
.
api
)
{
if
(
this
.
api
)
{
var
open
=
Common
.
localStorage
.
getItem
(
"
sse-hide-right-settings
"
);
this
.
_openRightMenu
=
(
open
===
null
||
parseInt
(
open
)
==
0
);
this
.
api
.
asc_registerCallback
(
'
asc_onFocusObject
'
,
_
.
bind
(
this
.
onFocusObject
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onFocusObject
'
,
_
.
bind
(
this
.
onFocusObject
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onSelectionChanged
'
,
_
.
bind
(
this
.
onSelectionChanged
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_onSelectionChanged
'
,
_
.
bind
(
this
.
onSelectionChanged
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_doubleClickOnObject
'
,
_
.
bind
(
this
.
onDoubleClickOnObject
,
this
));
this
.
api
.
asc_registerCallback
(
'
asc_doubleClickOnObject
'
,
_
.
bind
(
this
.
onDoubleClickOnObject
,
this
));
...
...
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file @
f8402c07
...
@@ -164,7 +164,7 @@ define([
...
@@ -164,7 +164,7 @@ define([
$
(
this
.
el
).
width
(
MENU_SCALE_PART
);
$
(
this
.
el
).
width
(
MENU_SCALE_PART
);
target_pane_parent
.
css
(
"
display
"
,
"
inline-block
"
);
target_pane_parent
.
css
(
"
display
"
,
"
inline-block
"
);
this
.
minimizedMode
=
false
;
this
.
minimizedMode
=
false
;
Common
.
localStorage
.
setItem
(
"
sse-hid
den
-right-settings
"
,
0
);
Common
.
localStorage
.
setItem
(
"
sse-hid
e
-right-settings
"
,
0
);
}
}
target_pane_parent
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
target_pane_parent
.
find
(
'
> .active
'
).
removeClass
(
'
active
'
);
target_pane
.
addClass
(
"
active
"
);
target_pane
.
addClass
(
"
active
"
);
...
@@ -176,7 +176,7 @@ define([
...
@@ -176,7 +176,7 @@ define([
target_pane_parent
.
css
(
"
display
"
,
"
none
"
);
target_pane_parent
.
css
(
"
display
"
,
"
none
"
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
this
.
minimizedMode
=
true
;
this
.
minimizedMode
=
true
;
Common
.
localStorage
.
setItem
(
"
sse-hid
den
-right-settings
"
,
1
);
Common
.
localStorage
.
setItem
(
"
sse-hid
e
-right-settings
"
,
1
);
}
}
this
.
fireEvent
(
'
rightmenuclick
'
,
[
this
,
btn
.
options
.
asctype
,
this
.
minimizedMode
]);
this
.
fireEvent
(
'
rightmenuclick
'
,
[
this
,
btn
.
options
.
asctype
,
this
.
minimizedMode
]);
...
@@ -231,7 +231,6 @@ define([
...
@@ -231,7 +231,6 @@ define([
target_pane
.
css
(
"
display
"
,
"
none
"
);
target_pane
.
css
(
"
display
"
,
"
none
"
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
$
(
this
.
el
).
width
(
SCALE_MIN
);
this
.
minimizedMode
=
true
;
this
.
minimizedMode
=
true
;
Common
.
localStorage
.
setItem
(
"
sse-hidden-right-settings
"
,
1
);
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
rightmenu
'
);
Common
.
NotificationCenter
.
trigger
(
'
layout:changed
'
,
'
rightmenu
'
);
},
},
...
...
apps/spreadsheeteditor/main/index.html
View file @
f8402c07
...
@@ -368,7 +368,7 @@
...
@@ -368,7 +368,7 @@
<script
src=
"../../../../sdkjs/cell/view/DrawingObjectsController.js"
></script>
<script
src=
"../../../../sdkjs/cell/view/DrawingObjectsController.js"
></script>
<script
src=
"../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"
></script>
<script
src=
"../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"
></script>
<script
src=
"../../../../sdkjs/c
ell/model/DrawingObjects
/Overlay.js"
></script>
<script
src=
"../../../../sdkjs/c
ommon
/Overlay.js"
></script>
<script
src=
"../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"
></script>
<script
src=
"../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"
></script>
<script
src=
"../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"
></script>
<script
src=
"../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"
></script>
...
...
apps/spreadsheeteditor/main/index.html.deploy
View file @
f8402c07
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<meta
name=
"keywords"
content=
""
/>
<meta
name=
"keywords"
content=
""
/>
<link
rel=
"icon"
href=
"resources/img/favicon.ico"
type=
"image/x-icon"
/>
<link
rel=
"icon"
href=
"resources/img/favicon.ico"
type=
"image/x-icon"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../../../sdkjs/cell/css/main.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../../../
../
sdkjs/cell/css/main.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../../../apps/spreadsheeteditor/main/resources/css/app.css"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../../../apps/spreadsheeteditor/main/resources/css/app.css"
>
<!-- splash -->
<!-- splash -->
...
...
build/documenteditor.json
View file @
f8402c07
This diff is collapsed.
Click to expand it.
build/package.json
View file @
f8402c07
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
"homepage"
:
"http://www.onlyoffice.com"
,
"homepage"
:
"http://www.onlyoffice.com"
,
"private"
:
true
,
"private"
:
true
,
"dependencies"
:
{
"dependencies"
:
{
"lodash"
:
"
3
.0.0"
,
"lodash"
:
"
^4
.0.0"
,
"grunt"
:
"0.4.5"
,
"grunt"
:
"0.4.5"
,
"grunt-exec"
:
"0.4.5"
,
"grunt-exec"
:
"0.4.5"
,
"grunt-replace"
:
"0.7.3"
,
"grunt-replace"
:
"0.7.3"
,
...
...
build/presentationeditor.json
View file @
f8402c07
This diff is collapsed.
Click to expand it.
build/spreadsheeteditor.json
View file @
f8402c07
This diff is collapsed.
Click to expand it.
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