diff --git a/ui (gen4)/index.html b/ui (gen4)/index.html
index 56c23240..ed6c71e9 100755
--- a/ui (gen4)/index.html
+++ b/ui (gen4)/index.html
@@ -61,7 +61,8 @@
transition: all 0.2s ease-out;
}
-/* XXX not 100% sure about this... */
+/* XXX not 100% sure about this...
+*/
.current-marker:not(.no-transitions) {
-webkit-transition: left 0.2s ease-out;
-moz-transition: left 0.2s ease-out;
diff --git a/ui (gen4)/viewer.js b/ui (gen4)/viewer.js
index d9e2ace2..b41591f4 100755
--- a/ui (gen4)/viewer.js
+++ b/ui (gen4)/viewer.js
@@ -944,6 +944,10 @@ actions.Actions({
w = w || this.screenwidth
+ // get config data and normalize...
+ size = (size
+ || this.config['ribbon-size-screens']
+ || 5) * w
threshold = (threshold
|| this.config['ribbon-resize-threshold']
|| 1) * w
@@ -967,11 +971,6 @@ actions.Actions({
// loaded more than we need by threshold...
|| nl + pl + 1 > size + threshold){
- // get config data and normalize...
- size = (size
- || this.config['ribbon-size-screens']
- || 5) * w
-
this.resizeRibbon(target, size)
}
}],
@@ -1007,7 +1006,7 @@ actions.Actions({
// - setupe RibbonAlignToFirst first
// - go to top ribbon
// - shift image up
-// XXX The two should be completely independent....
+// XXX The two should be completely independent.... (???)
// XXX need to test and tweak with actual images...
var PartialRibbons =
module.PartialRibbons = Feature({
@@ -1022,7 +1021,6 @@ module.PartialRibbons = Feature({
setup: function(actions){
var feature = this
-
if(!('ribbon-size-screens' in actions.config)){
actions.config['ribbon-size-screens'] = this.size
}
@@ -1074,7 +1072,71 @@ actions.Actions({
})
-// XXX
+// XXX an ideal case would be:
+//
+// A)
+// viewer
+// +---------------+
+// | image | - small image
+// | +---+ | - square image block
+// | | | | - smaller than this the block is always square
+// | +---+ | - we just change scale
+// | |
+// +---------------+
+//
+//
+// B)
+// viewer
+// +---------------+
+// | +-----------+ | - bigger image
+// | | image | | - block close to viewer proportion
+// | | <--> | | - image block growing parallel to viewer
+// | | | | longer side
+// | +-----------+ |
+// +---------------+
+//
+//
+// C)
+// viewer
+// +---------------+
+// | image | - image block same size as viewer
+// | |
+// | |
+// | |
+// | |
+// +---------------+
+//
+//
+// D)
+// image
+// + - - - - - - - +
+// . .
+// +---------------+
+// | viewer | - image bigger than viewer in one dimension
+// | ^ | - block grows along viewer short side, now
+// | | | closer to image proportions
+// | v | - drag enabled
+// | |
+// +---------------+
+// . .
+// + - - - - - - - +
+//
+//
+// E)
+// image
+// + - - - - - - - - - +
+// . .
+// . +---------------+ .
+// . | viewer | . - image bigger than viewer
+// . | | . - image block same proportion as image
+// . | | . - we just change scale
+// . | | . - drag enabled
+// . | | .
+// . +---------------+ .
+// . .
+// + - - - - - - - - - +
+//
+//
var SingleImageView =
module.SingleImageView = Feature({
tag: 'ui-single-image-view',