flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 10:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a couple of bugs in panel event system...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-12-11 03:21:44 +04:00
parent 3eebfbdbec
commit aa5a982109
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/editor.js
View File

@ -9,6 +9,25 @@
/*********************************************************************/ /*********************************************************************/
function _setupPanel(panel){
return panel
.on('panelClosing', function(){
if($('.panel').length <= 1){
toggleEditor('off')
}
})
.on('newPanel', function(evt, panel){
_setupPanel(panel)
})
// make clicks on unfocusable elements remove focus...
.click(function(){
if(event.target != $('.panel :focus')[0]){
$('.panel :focus').blur()
}
})
}
var toggleEditor = createCSSClassToggler( var toggleEditor = createCSSClassToggler(
'.viewer', '.viewer',
'.editor-visible', '.editor-visible',
@ -19,7 +38,7 @@ var toggleEditor = createCSSClassToggler(
// create the editor if this is first init... // create the editor if this is first init...
if(ed.length == 0){ if(ed.length == 0){
$('.viewer') $('.viewer')
.append(makeEditorControls('.current.image') .append(_setupPanel(makeEditorControls('.current.image'))
//.draggable('option', 'snap', '.viewer') //.draggable('option', 'snap', '.viewer')
.css({ .css({
// prevent the editor from moving under // prevent the editor from moving under
@ -28,18 +47,9 @@ var toggleEditor = createCSSClassToggler(
'margin-top': '20px', 'margin-top': '20px',
top: '50px', top: '50px',
left: '5px', left: '5px',
}) }))
// XXX add handlers for saving data to images... // XXX add handlers for saving data to images...
// XXX // XXX
// make clicks on unfocusable elements remove focus...
.on('panelClosing', function(){
toggleEditor('off')
})
.click(function(){
if(event.target != $('.panel :focus')[0]){
$('.panel :focus').blur()
}
}))
// setup the event to update the editor... // setup the event to update the editor...
.on('focusingImage', function(){ .on('focusingImage', function(){
if(toggleEditor('?') == 'on'){ if(toggleEditor('?') == 'on'){
@ -58,7 +68,7 @@ var toggleEditor = createCSSClassToggler(
// hide... // hide...
} else { } else {
ed.hide() ed.remove()
} }
}) })

11
ui/lib/panels.js
View File

@ -25,7 +25,7 @@ function makePanel(title, open, editable_title, remove_on_empty){
.click(function(){ .click(function(){
panel panel
.trigger('panelClosing') .trigger('panelClosing')
.hide() .remove()
return false return false
}) })
.html('&times;'))) .html('&times;')))
@ -65,19 +65,22 @@ function makePanel(title, open, editable_title, remove_on_empty){
console.log('stop (outside: '+_outside+')') console.log('stop (outside: '+_outside+')')
// do this only when dropping outside the panel... // do this only when dropping outside the panel...
if(_outside){ if(_outside){
makePanel() var new_panel = makePanel()
// XXX adjust this to scale... // XXX adjust this to scale...
// XXX adjust this to parent offset... // XXX adjust this to parent offset...
.css(ui.offset) .css(ui.offset)
.appendTo(panel.parent()) .appendTo(panel.parent())
.find('.panel-content') new_panel.find('.panel-content')
.append(ui.item) .append(ui.item)
_outside = false _outside = false
panel.trigger('newPanel', [new_panel])
} }
// remove the panel when it runs out of sub-panels... // remove the panel when it runs out of sub-panels...
if(remove_on_empty && panel.find('.sub-panel').length == 0){ if(remove_on_empty && panel.find('.sub-panel').length == 0){
panel.remove() panel
.trigger('panelClosing')
.remove()
} }
}, },
// XXX are these the correct events??? // XXX are these the correct events???