Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2012-08-15 04:03:11 +04:00
parent 04ab8ae7f6
commit ce000b261e
4 changed files with 36 additions and 42 deletions

View File

@ -54,7 +54,7 @@ function setup(){
// XXX
ImageGrid.toggleSingleImageMode('off')
enableTransitions()
ImageGrid.toggleTransitions('on')
// setup event handlers...
setupEvents()

View File

@ -51,7 +51,7 @@ var ImageGrid = {
ImageGrid.ACTION({
title: 'set',
doc: 'Set an option\'s value, calling apropriate callbacks.',
doc: 'Set option(s) value(s), calling apropriate callbacks.',
group: 'API',
call: function (obj){
for(var n in obj){
@ -445,10 +445,11 @@ function setupControlElements(){
$('.screen-button.promote').click(shiftImageDown)
$('.screen-button.zoom-in').click(function(){scaleContainerBy(ImageGrid.option.ZOOM_FACTOR)})
$('.screen-button.zoom-out').click(function(){scaleContainerBy(1/ImageGrid.option.ZOOM_FACTOR)})
$('.screen-button.toggle-wide').click(ImageGrid.toggleWideView)
// XXX
$('.screen-button.toggle-wide').click(function(){scaleContainerBy(0.2)})
$('.screen-button.toggle-single').click(ImageGrid.toggleSingleImageMode)
$('.screen-button.fit-three').click(fitThreeImages)
$('.screen-button.show-controls').click(showControls)
$('.screen-button.show-controls').click(function(){ImageGrid.toggleControls('on')})
$('.screen-button.settings').click(function(){alert('not implemented yet...')})
}
@ -824,27 +825,6 @@ ImageGrid.ACTION({
})
// XXX is this worth it??
ImageGrid.ACTION({
title: 'toggleWideView',
doc: 'Toggle wide view mode.',
group: 'Modes',
type: 'toggle',
call: createCSSClassToggler('.viewer', 'wide-view-mode',
// pre...
function(action){
if(action == 'on'){
ImageGrid.option.ORIGINAL_FIELD_SCALE = getElementScale($('.field'))
setContainerScale(0.1)
} else {
setContainerScale(ImageGrid.option.ORIGINAL_FIELD_SCALE)
}
},
// post...
function(){})
})
// XXX is this worth it??
ImageGrid.ACTION({
title: 'toggleSingleRibbonMode',
@ -932,17 +912,34 @@ function toggleBackgroundModes(){
var toggleSingleImageModeTransitions = createCSSClassToggler('.viewer', 'no-single-image-transitions')
//var toggleSingleImageModeTransitions = createCSSClassToggler('.viewer', 'no-single-image-transitions')
ImageGrid.ACTION({
title: 'toggleSingleImageModeTransitions',
doc: 'Toggle transitions in single image mode.',
group: 'Modes',
type: 'toggle',
call: createCSSClassToggler('.viewer', 'no-single-image-transitions')
})
var toggleControls = createCSSClassToggler('.viewer', 'hidden-controls')
var showControls = function(){toggleControls('on')}
var hideControls = function(){toggleControls('off')}
//var toggleControls = createCSSClassToggler('.viewer', 'hidden-controls')
ImageGrid.ACTION({
title: 'toggleControls',
doc: 'Toggle UI controls.',
group: 'Modes',
type: 'toggle',
call: createCSSClassToggler('.viewer', 'hidden-controls')
})
var toggleTransitions = createCSSClassToggler('.viewer', 'transitions-enabled')
var enableTransitions = function(){toggleTransitions('on')}
var disableTransitions = function(){toggleTransitions('off')}
//var toggleTransitions = createCSSClassToggler('.viewer', 'transitions-enabled')
ImageGrid.ACTION({
title: 'toggleTransitions',
doc: 'Toggle global transitions.',
group: 'Modes',
type: 'toggle',
call: createCSSClassToggler('.viewer', 'transitions-enabled')
})
@ -1353,5 +1350,6 @@ function sortImagesByPath(){
/*********************************************************************/
// vim:set ts=4 sw=4 nowrap :

View File

@ -51,7 +51,7 @@ function setup(){
// XXX
// this will set the defaults...
ImageGrid.toggleSingleImageMode('off')
enableTransitions()
ImageGrid.toggleTransitions('on')
// setup event handlers...
setupEvents()
@ -130,7 +130,7 @@ $(document).ready(setup);
<div class="demo-buttons">
<button onclick="toggleMarkers()">Toggle Markers (m)</button>
<button onclick="toggleBackgroundModes()">toggle background modes (b)</button>
<button onclick="toggleControls()">toggle screen controls (tab)</button>
<button onclick="ImageGrid.toggleControls()">toggle screen controls (tab)</button>
<br><br>
@ -139,7 +139,7 @@ $(document).ready(setup);
<br><br>
<button onclick="toggleSingleImageModeTransitions()">toggle single image mode transitions (t)</button>
<button onclick="ImageGrid.toggleSingleImageModeTransitions()">toggle single image mode transitions (t)</button>
<br><br>
@ -171,10 +171,6 @@ $(document).ready(setup);
<br><br>
<button onclick="ImageGrid.toggleWideView()">toggle wide view</button>
<br><br>
<button onclick="createRibbon('prev')" disabled>create ribbon above (helper)</button><br>
<button onclick="createRibbonBelow('next')" disabled>create ribbon below (helper)</button>

View File

@ -6,10 +6,10 @@ var keybindings = {
70: ImageGrid.toggleSingleImageMode, // f
83: ImageGrid.toggleSingleRibbonMode, // s
13: 70, // Enter
84: toggleSingleImageModeTransitions, // t
65: toggleTransitions, // a
84: ImageGrid.toggleSingleImageModeTransitions, // t
65: ImageGrid.toggleTransitions, // a
9: ImageGrid.toggleControls, // tab
66: toggleBackgroundModes, // b
9: toggleControls, // tab
77: toggleMarkers, // m