mirror of
https://github.com/flynx/PortableMag.git
synced 2025-10-29 19:20:09 +00:00
more work on image template pages...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
0644facc91
commit
9ba9fb6b09
@ -220,8 +220,9 @@ function setupEditorToolbars(){
|
||||
.click(function(){
|
||||
// NOTE: this does the same thing as handleClick...
|
||||
togglePageView('on')
|
||||
setCurrentPage(target)
|
||||
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
|
||||
// XXX for some reason this does not work...
|
||||
setCurrentPage()
|
||||
setTransitionEasing($('.magazien'), 'cubic-bezier(0.33,0.66,0.66,1)')
|
||||
})
|
||||
|
||||
// the toolbars...
|
||||
|
||||
@ -204,6 +204,7 @@ $(document).ready(function(){
|
||||
|
||||
$('.viewer')
|
||||
.on('scrollCancelled', function(){ setCurrentPage() })
|
||||
.on('shortClick', handleCaption)
|
||||
.on('shortClick', handleClick)
|
||||
.on('longClick', handleLongClick)
|
||||
.on('swipeLeft', handleSwipeLeft)
|
||||
@ -742,7 +743,7 @@ $(document).ready(function(){
|
||||
|
||||
<div class="page vertical-image-fit dark">
|
||||
<div class="content">
|
||||
<img onclick="toggleCaption($(this))" src="img.jpg">
|
||||
<img src="img.jpg">
|
||||
<div class="caption hidden" contenteditable="false">
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.
|
||||
</div>
|
||||
@ -752,7 +753,7 @@ $(document).ready(function(){
|
||||
|
||||
<div class="page horizontal-image-fit light">
|
||||
<div class="content">
|
||||
<img onclick="toggleCaption($(this))" src="landscape.jpg">
|
||||
<img src="landscape.jpg">
|
||||
<div class="caption hidden" contenteditable="false">
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.
|
||||
</div>
|
||||
@ -762,7 +763,7 @@ $(document).ready(function(){
|
||||
|
||||
<div class="page vertical-image-fit no-resize dark">
|
||||
<div class="content">
|
||||
<img onclick="toggleCaption($(this))" src="img.jpg">
|
||||
<img src="img.jpg">
|
||||
<div class="caption hidden" contenteditable="false">
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.
|
||||
</div>
|
||||
|
||||
24
layout.js
24
layout.js
@ -72,10 +72,6 @@ var togglePageView = createCSSClassToggler(
|
||||
var toggleInlineEditorMode = createCSSClassToggler('.chrome', 'inline-editor-mode')
|
||||
|
||||
|
||||
function toggleCaption(img){
|
||||
img.parent().find('.caption').toggleClass('hidden')
|
||||
}
|
||||
|
||||
|
||||
|
||||
/************************************************** event handlers ***/
|
||||
@ -100,6 +96,26 @@ function handleClick(evt, data){
|
||||
}
|
||||
}
|
||||
|
||||
// Click on caption...
|
||||
function handleCaption(evt, data){
|
||||
elem = $(data.orig_event.target)
|
||||
if(elem.is('.vertical-image-fit, .horizontal-image-fit')
|
||||
|| elem.parents('.vertical-image-fit, .horizontal-image-fit').length > 0){
|
||||
|
||||
// prevent doing anything in ribbon mode..
|
||||
if(togglePageView('?') == 'off'){
|
||||
return
|
||||
}
|
||||
|
||||
if(elem.hasClass('caption')){
|
||||
elem.toggleClass('hidden')
|
||||
return
|
||||
}
|
||||
|
||||
elem.parents('.page').find('.caption').toggleClass('hidden')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Long Click
|
||||
// - in full page, go to ribbon
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
/**********************************************************************
|
||||
*
|
||||
**********************************************************************/
|
||||
|
||||
.current-page-indicator {
|
||||
display: none;
|
||||
position: absolute;
|
||||
@ -188,3 +192,13 @@
|
||||
}
|
||||
|
||||
|
||||
/* allways show captions in editor's full page mode */
|
||||
.full-page-view-mode.editor .current.page.horizontal-image-fit .caption,
|
||||
.full-page-view-mode.editor .current.page.vertical-image-fit .caption {
|
||||
opacity: 0.8;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*********************************************************************/
|
||||
|
||||
22
magazine.css
22
magazine.css
@ -787,6 +787,24 @@ div.page-number-text {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* XXX fin a universal way to do this...
|
||||
.page.image-fit .content {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
width: auto;
|
||||
min-width: 400px;
|
||||
max-width: 800px;
|
||||
}
|
||||
.page.image-fit .content img {
|
||||
height: auto;
|
||||
max-height: 100%;
|
||||
width: auto;
|
||||
max-width: 100%;
|
||||
|
||||
cursor: hand;
|
||||
}
|
||||
*/
|
||||
|
||||
.page.vertical-image-fit .content {
|
||||
width: auto;
|
||||
}
|
||||
@ -804,10 +822,6 @@ div.page-number-text {
|
||||
cursor: hand;
|
||||
}
|
||||
|
||||
.page.horizontal-image-fit .caption,
|
||||
.page.vertical-image-fit .caption {
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*********************************************************************/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user