diff --git a/ui/TODO.otl b/ui/TODO.otl index 96f212fe..19d84c9a 100755 --- a/ui/TODO.otl +++ b/ui/TODO.otl @@ -1,5 +1,6 @@ Priority work - [_] 70% Preview II + [_] 67% Preview II + [_] BUG: moving the last image from a ribbon up will make the screen jump... [_] do something sensible when no images are loaded... | in the simplest case, just write something in the middle of | the background... diff --git a/ui/fullscreen.html b/ui/fullscreen.html index 45088759..6f636e4d 100755 --- a/ui/fullscreen.html +++ b/ui/fullscreen.html @@ -153,7 +153,7 @@ $(document).ready(setup); -
+
diff --git a/ui/gallery-prototype.js b/ui/gallery-prototype.js index eff24576..ef4a9828 100755 --- a/ui/gallery-prototype.js +++ b/ui/gallery-prototype.js @@ -1231,18 +1231,22 @@ function setupEvents(){ .swipe({ swipeLeft: ImageGrid.nextImage, swipeRight: ImageGrid.prevImage, + swipeUp: ImageGrid.shiftImageUp, swipeDown: ImageGrid.shiftImageDown, // XXX do gradual zooming... - pinchIn: ImageGrid.scaleContainerDown, - pinchOut: ImageGrid.scaleContainerUp + //pinchIn: ImageGrid.scaleContainerDown, + //pinchOut: ImageGrid.scaleContainerUp, + + fingers: 'all' }) + // dragging... // XXX make this work seamlessly with touchSwipe... // XXX cancel clicks while dragging... // XXX this does not work on android... - $('.field').draggable() + //$('.field').draggable() }