From 1ceacd58cf6a9caedf1eff4bb23221a1bb6e1963 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 28 Jan 2010 10:53:39 -0700 Subject: [PATCH] Move DimpSlider to horde (rename to Slider2) --- imp/js/DimpSlider.js => horde/js/slider2.js | 18 +++++++++--------- imp/index-dimp.php | 8 ++++---- imp/js/ViewPort.js | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) rename imp/js/DimpSlider.js => horde/js/slider2.js (95%) diff --git a/imp/js/DimpSlider.js b/horde/js/slider2.js similarity index 95% rename from imp/js/DimpSlider.js rename to horde/js/slider2.js index 714ff7e45..91bd85885 100644 --- a/imp/js/DimpSlider.js +++ b/horde/js/slider2.js @@ -1,5 +1,5 @@ /** - * DimpSlider.js - A minimalist library to create a slider that acts like a + * Slider2.js - A minimalist library to create a slider that acts like a * browser's native scrollbar. * * Requires prototype.js 1.6.0.2+ @@ -7,7 +7,7 @@ * * Usage: * ------ - * slider = new DimpSlider(track, opts); + * slider = new Slider2(track, opts); * * track - (element|string) TODO * opts - (object) TODO @@ -17,12 +17,12 @@ * Custom events are triggered on the track element. The parameters given * below are available through the 'memo' property of the Event object. * - * DimpSlider:change - * Fired on TODO + * Slider2:change + * Fired when slidebar is released. * params: NONE * - * DimpSlider:slide - * Fired on TODO + * Slider2:slide + * Fired when slidebar is moved. * params: NONE * * @@ -53,7 +53,7 @@ * @author Michael Slusarz */ -var DimpSlider = Class.create({ +var Slider2 = Class.create({ value: 0, initialize: function(track, options) @@ -132,7 +132,7 @@ var DimpSlider = Class.create({ if (this.active) { this.dragging = true; this._setScrollPosition('px', Math.min(Math.max(0, e.pointerY() - this.offsetY - this.curroffsets[1]), this.handletop)); - this.track.fire('DimpSlider:slide'); + this.track.fire('Slider2:slide'); if (Prototype.Browser.WebKit) { window.scrollBy(0,0); } @@ -159,7 +159,7 @@ var DimpSlider = Class.create({ _updateFinished: function() { - this.track.fire('DimpSlider:change'); + this.track.fire('Slider2:change'); }, setHandleLength: function(pagesize, totalsize) diff --git a/imp/index-dimp.php b/imp/index-dimp.php index 2905c493e..0892a20ab 100644 --- a/imp/index-dimp.php +++ b/imp/index-dimp.php @@ -18,14 +18,14 @@ Horde_Registry::appInit('imp'); $scripts = array( array('ContextSensitive.js', 'imp'), array('DimpBase.js', 'imp'), - array('DimpSlider.js', 'imp'), array('ViewPort.js', 'imp'), array('dialog.js', 'imp'), - array('dragdrop2.js', 'horde'), - array('imp.js', 'imp'), array('mailbox-dimp.js', 'imp'), + array('imp.js', 'imp'), + array('dragdrop2.js', 'horde'), array('popup.js', 'horde'), - array('redbox.js', 'horde') + array('redbox.js', 'horde'), + array('slider2.js', 'horde') ); /* Get site specific menu items. */ diff --git a/imp/js/ViewPort.js b/imp/js/ViewPort.js index c7c9078f5..bf7f339e8 100644 --- a/imp/js/ViewPort.js +++ b/imp/js/ViewPort.js @@ -210,8 +210,8 @@ * vpScrollDown - The DOWN arrow. * * - * Requires prototypejs 1.6+, DimpSlider.js, scriptaculous 1.8+ (effects.js - * only), and Horde's dragdrop2.js. + * Requires prototypejs 1.6+, scriptaculous 1.8+ (effects.js only), and + * Horde's dragdrop2.js and slider2.js. * * Copyright 2005-2010 The Horde Project (http://www.horde.org/) * @@ -1301,13 +1301,13 @@ ViewPort_Scroller = Class.create({ this.scrollDiv = new Element('DIV', { className: 'vpScroll' }).setStyle({ overflow: 'hidden' }).hide(); c.insert({ after: this.scrollDiv }); - this.scrollDiv.observe('DimpSlider:change', this._onScroll.bind(this)); + this.scrollDiv.observe('Slider2:change', this._onScroll.bind(this)); if (this.vp.opts.onSlide) { - this.scrollDiv.observe('DimpSlider:slide', this.vp.opts.onSlide); + this.scrollDiv.observe('Slider2:slide', this.vp.opts.onSlide); } // Create scrollbar object. - this.scrollbar = new DimpSlider(this.scrollDiv, { + this.scrollbar = new Slider2(this.scrollDiv, { buttonclass: { up: 'vpScrollUp', down: 'vpScrollDown' }, cursorclass: 'vpScrollCursor', pagesize: this.vp.getPageSize(), -- 2.11.0