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
30e77f80
Commit
30e77f80
authored
Apr 28, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE] Баг с превью в полноэкранном режиме при наличии переходов между слайдами.
parent
298880d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
25 deletions
+45
-25
apps/presentationeditor/main/app/controller/Statusbar.js
apps/presentationeditor/main/app/controller/Statusbar.js
+13
-8
apps/presentationeditor/main/app/controller/Toolbar.js
apps/presentationeditor/main/app/controller/Toolbar.js
+13
-8
apps/presentationeditor/main/app/controller/Viewport.js
apps/presentationeditor/main/app/controller/Viewport.js
+1
-0
apps/presentationeditor/main/app/view/DocumentHolder.js
apps/presentationeditor/main/app/view/DocumentHolder.js
+18
-9
No files found.
apps/presentationeditor/main/app/controller/Statusbar.js
View file @
30e77f80
...
...
@@ -121,18 +121,23 @@ define([
},
onPreview
:
function
(
btn
,
e
)
{
var
previewPanel
=
PE
.
getController
(
'
Viewport
'
).
getView
(
'
DocumentPreview
'
);
if
(
previewPanel
)
{
var
previewPanel
=
PE
.
getController
(
'
Viewport
'
).
getView
(
'
DocumentPreview
'
),
me
=
this
;
if
(
previewPanel
&&
me
.
api
)
{
previewPanel
.
show
();
if
(
!
this
.
statusbar
.
mode
.
isDesktopApp
)
this
.
fullScreen
(
document
.
documentElement
);
var
onWindowResize
=
function
()
{
Common
.
NotificationCenter
.
off
(
'
window:resize
'
,
onWindowResize
);
if
(
this
.
api
)
{
var
current
=
this
.
api
.
getCurrentPage
();
this
.
api
.
StartDemonstration
(
'
presentation-preview
'
,
_
.
isNumber
(
current
)
?
current
:
0
);
var
current
=
me
.
api
.
getCurrentPage
();
me
.
api
.
StartDemonstration
(
'
presentation-preview
'
,
_
.
isNumber
(
current
)
?
current
:
0
);
Common
.
component
.
Analytics
.
trackEvent
(
'
Status Bar
'
,
'
Preview
'
);
}
};
if
(
!
me
.
statusbar
.
mode
.
isDesktopApp
)
{
Common
.
NotificationCenter
.
on
(
'
window:resize
'
,
onWindowResize
);
me
.
fullScreen
(
document
.
documentElement
);
}
else
onWindowResize
();
}
},
...
...
apps/presentationeditor/main/app/controller/Toolbar.js
View file @
30e77f80
...
...
@@ -737,18 +737,23 @@ define([
},
onPreview
:
function
(
btn
,
e
)
{
var
previewPanel
=
PE
.
getController
(
'
Viewport
'
).
getView
(
'
DocumentPreview
'
);
if
(
previewPanel
)
{
var
previewPanel
=
PE
.
getController
(
'
Viewport
'
).
getView
(
'
DocumentPreview
'
),
me
=
this
;
if
(
previewPanel
&&
me
.
api
)
{
previewPanel
.
show
();
if
(
!
this
.
toolbar
.
mode
.
isDesktopApp
)
this
.
fullScreen
(
document
.
documentElement
);
var
onWindowResize
=
function
()
{
Common
.
NotificationCenter
.
off
(
'
window:resize
'
,
onWindowResize
);
if
(
this
.
api
)
{
var
current
=
this
.
api
.
getCurrentPage
();
this
.
api
.
StartDemonstration
(
'
presentation-preview
'
,
_
.
isNumber
(
current
)
?
current
:
0
);
var
current
=
me
.
api
.
getCurrentPage
();
me
.
api
.
StartDemonstration
(
'
presentation-preview
'
,
_
.
isNumber
(
current
)
?
current
:
0
);
Common
.
component
.
Analytics
.
trackEvent
(
'
ToolBar
'
,
'
Preview
'
);
}
};
if
(
!
me
.
toolbar
.
mode
.
isDesktopApp
)
{
Common
.
NotificationCenter
.
on
(
'
window:resize
'
,
onWindowResize
);
me
.
fullScreen
(
document
.
documentElement
);
}
else
onWindowResize
();
}
},
...
...
apps/presentationeditor/main/app/controller/Viewport.js
View file @
30e77f80
...
...
@@ -123,6 +123,7 @@ define([
onWindowResize
:
function
(
e
)
{
this
.
onLayoutChanged
(
'
window
'
);
Common
.
NotificationCenter
.
trigger
(
'
window:resize
'
);
}
});
});
apps/presentationeditor/main/app/view/DocumentHolder.js
View file @
30e77f80
...
...
@@ -667,13 +667,17 @@ define([
e
.
stopPropagation
();
if
(
me
.
slidesCount
>
0
)
{
var
previewPanel
=
PE
.
getController
(
'
Viewport
'
).
getView
(
'
DocumentPreview
'
);
if
(
previewPanel
&&
!
previewPanel
.
isVisible
())
{
if
(
previewPanel
&&
!
previewPanel
.
isVisible
()
&&
me
.
api
)
{
previewPanel
.
show
();
if
(
!
me
.
mode
.
isDesktopApp
)
me
.
fullScreen
(
document
.
documentElement
);
if
(
me
.
api
)
{
var
onWindowResize
=
function
()
{
Common
.
NotificationCenter
.
off
(
'
window:resize
'
,
onWindowResize
);
me
.
api
.
StartDemonstration
(
'
presentation-preview
'
,
0
);
}
};
if
(
!
me
.
mode
.
isDesktopApp
)
{
Common
.
NotificationCenter
.
on
(
'
window:resize
'
,
onWindowResize
);
me
.
fullScreen
(
document
.
documentElement
);
}
else
onWindowResize
();
}
}
};
...
...
@@ -924,16 +928,21 @@ define([
caption
:
me
.
txtPreview
}).
on
(
'
click
'
,
function
(
item
)
{
var
previewPanel
=
PE
.
getController
(
'
Viewport
'
).
getView
(
'
DocumentPreview
'
);
if
(
previewPanel
)
{
if
(
previewPanel
&&
me
.
api
)
{
previewPanel
.
show
();
me
.
fullScreen
(
document
.
documentElement
);
var
onWindowResize
=
function
()
{
Common
.
NotificationCenter
.
off
(
'
window:resize
'
,
onWindowResize
);
if
(
me
.
api
)
{
var
current
=
me
.
api
.
getCurrentPage
();
me
.
api
.
StartDemonstration
(
'
presentation-preview
'
,
_
.
isNumber
(
current
)
?
current
:
0
);
Common
.
component
.
Analytics
.
trackEvent
(
'
DocumentHolder
'
,
'
Preview
'
);
}
};
if
(
!
me
.
mode
.
isDesktopApp
)
{
Common
.
NotificationCenter
.
on
(
'
window:resize
'
,
onWindowResize
);
me
.
fullScreen
(
document
.
documentElement
);
}
else
onWindowResize
();
}
});
...
...
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