Mercurial > hg > digilib-old

changeset 1038:a79be2432eb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
put new slider code back into sliders plugin
author hertzhaft
date Mon, 19 Mar 2012 17:39:35 +0100
parents 113ac922ac63
children aef8a02e7ea5
files webapp/src/main/webapp/jquery/digilib.html webapp/src/main/webapp/jquery/jquery.digilib.buttons.js webapp/src/main/webapp/jquery/jquery.digilib.sliders.js
diffstat 3 files changed, 60 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/digilib.html	Mon Mar 19 16:40:50 2012 +0100
+++ b/webapp/src/main/webapp/jquery/digilib.html	Mon Mar 19 17:39:35 2012 +0100
@@ -19,7 +19,7 @@
         <script type="text/javascript" src="jquery.range.js"></script>
         <link rel="stylesheet" type="text/css" href="jquery.range.css" />
         <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
-        <!-- <script type="text/javascript" src="jquery.digilib.sliders.js"></script> -->
+        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
         <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
         <script type="text/javascript" src="jquery.digilib.marks.js"></script>
         <script type="text/javascript" src="jquery.digilib.regions.js"></script>
--- a/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js	Mon Mar 19 16:40:50 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.buttons.js	Mon Mar 19 17:39:35 2012 +0100
@@ -83,8 +83,7 @@
             icon : "rotate.png"
             },
         brgt : {
-            //onclick : "brightness",
-            onclick : "sliderBrgt",
+            onclick : "brightness",
             tooltip : "set brightness",
             icon : "brightness.png"
             },
@@ -95,7 +94,6 @@
             },
         rgb : {
             onclick : "setRGB",
-            // onclick : sliderRGB,
             tooltip : "set rgb values",
             icon : "rgb.png"
             },
@@ -246,60 +244,8 @@
                     left : Math.abs(buttonRect.x - divRect.width - 4),
                     top : buttonRect.y + 4
                     });
-            },
-            
-            // shows brightness slider
-            sliderBrgt : function (data) {
-                var $elem = data.$elem;
-                var brgt = data.settings.brgt;
-                var cssPrefix = data.settings.cssPrefix;
-                var cssClass = cssPrefix + 'sliderNeu';
-                var sliderHtml = '\
-            <div class="'+cssClass+'" style="width:300px; background-color:white">\
-                <form class="'+cssClass+'">\
-                    <span>Brightness:</span>\
-                    <input type="range" class="'+cssClass+'range" name="brgt" min="-255" max="255" value="'+brgt+'"/>\
-                    <input type="text" class="'+cssClass+'text" name="brgt" size="3" value="'+brgt+'"/>\
-                    <br/>\
-                    <input class="'+cssClass+'cancel" type="button" value="Cancel"/><input type="submit" name="sub" value="Ok"/>\
-                </form>\
-            </div>';
-                var $slider = $(sliderHtml);
-                $elem.append($slider);
-                var $range = $slider.find('input.'+cssClass+'range');
-                var $text = $slider.find('input.'+cssClass+'text');
-                // fix non-HTML5 slider
-                if ($range.prop('type') !== 'range') {
-                    console.debug('fix input type=range');
-                    $range.range({change: function (val) {
-                        $range.trigger('change');
-                    }});
-                }
-                // connect slider and input
-                $range.on('change', function () {
-                    var val = $range.val();
-                    $text.val(val);
-                });
-                $text.on('change', function () {
-                    var val = $text.val();
-                    $range.val(val);
-                });
-                // handle submit
-                $slider.find('form').on('submit', function () {
-                    console.debug("brgt-form:", this, " sub=", this.sub);
-                    brgt = $text.val();
-                    digilib.actions.brightness(data, brgt);
-                    $slider.remove();
-                    return false;  
-                });
-                // handle cancel
-                $slider.find('.'+cssClass+'cancel').on('click', function () {
-                    $slider.remove();
-                });
-                $slider.fadeIn();
-                fn.centerOnScreen(data, $slider);
             }
-        };
+    };
 
     // plugin installation called by digilib on plugin object.
     var install = function(plugin) {
--- a/webapp/src/main/webapp/jquery/jquery.digilib.sliders.js	Mon Mar 19 16:40:50 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.sliders.js	Mon Mar 19 17:39:35 2012 +0100
@@ -129,6 +129,58 @@
             $panel.prepend($slider);
             fn.centerOnScreen(data, $panel);
             $slider.slider('show');
+        },
+
+        // shows brightness slider
+        sliderBrgt : function (data) {
+            var $elem = data.$elem;
+            var brgt = data.settings.brgt;
+            var cssPrefix = data.settings.cssPrefix;
+            var cssClass = cssPrefix + 'sliderNeu';
+            var sliderHtml = '\
+            <div class="'+cssClass+'" style="width:300px; background-color:white; padding:10px;">\
+                <form class="'+cssClass+'">\
+                    <span>Brightness:</span>\
+                    <input type="range" class="'+cssClass+'range" name="brgt" min="-255" max="255" value="'+brgt+'"/>\
+                    <input type="text" class="'+cssClass+'text" name="brgt" size="3" value="'+brgt+'"/>\
+                    <br/>\
+                    <input class="'+cssClass+'cancel" type="button" value="Cancel"/><input type="submit" name="sub" value="Ok"/>\
+                </form>\
+            </div>';
+            var $slider = $(sliderHtml);
+            $elem.append($slider);
+            var $range = $slider.find('input.'+cssClass+'range');
+            var $text = $slider.find('input.'+cssClass+'text');
+            // fix non-HTML5 slider
+            if ($range.prop('type') !== 'range') {
+                console.debug('fix input type=range');
+                $range.range({change: function (val) {
+                    $range.trigger('change');
+                }});
+            }
+            // connect slider and input
+            $range.on('change', function () {
+                var val = $range.val();
+                $text.val(val);
+            });
+            $text.on('change', function () {
+                var val = $text.val();
+                $range.val(val);
+            });
+            // handle submit
+            $slider.find('form').on('submit', function () {
+                console.debug("brgt-form:", this, " sub=", this.sub);
+                brgt = $text.val();
+                digilib.actions.brightness(data, brgt);
+                $slider.remove();
+                return false;  
+            });
+            // handle cancel
+            $slider.find('.'+cssClass+'cancel').on('click', function () {
+                $slider.remove();
+            });
+            $slider.fadeIn();
+            fn.centerOnScreen(data, $slider);
         }
     };
 
@@ -260,9 +312,10 @@
     // set standard button actions (rotate, brightness, contrast) to slider
     var setButtonActions = function (buttons) {
         console.debug('sliders: setting button acions. digilib:', digilib);
-        setButtonAction(buttons, 'rot', 'sliderRotate');
-        setButtonAction(buttons, 'brgt', 'sliderBrightness');
-        setButtonAction(buttons, 'cont', 'sliderContrast');
+        //setButtonAction(buttons, 'rot', 'sliderRotate');
+        //setButtonAction(buttons, 'brgt', 'sliderBrightness');
+        setButtonAction(buttons, 'brgt', 'sliderBrgt');
+        //setButtonAction(buttons, 'cont', 'sliderContrast');
     };
 
     // plugin installation called by digilib on plugin object.
@@ -275,7 +328,7 @@
         // add defaults, actions, buttons
         $.extend(true, digilib.defaults, defaults); // make deep copy
         $.extend(digilib.actions, actions);
-        //setButtonActions(digilib.buttons);
+        setButtonActions(digilib.buttons);
         // export functions
         fn.setupSlider = setupSlider;
         fn.setupPanel = setupPanel;