Menu
▾
▴
[Collective-checkins] r69386 - in collective.plonetruegallery/trunk: . collective/plonetruegallery collective/plonetruegallery/browser/resources/scripts collective/plonetruegallery/content
|
From: Nathan V. G. <svn...@pl...> - 2008-08-01 21:05:09
|
Author: vangheem
Date: Fri Aug 1 21:05:07 2008
New Revision: 69386
Modified:
collective.plonetruegallery/trunk/collective/plonetruegallery/browser/resources/scripts/true-gallery.js
collective.plonetruegallery/trunk/collective/plonetruegallery/content/config.py
collective.plonetruegallery/trunk/collective/plonetruegallery/content/gallery.py
collective.plonetruegallery/trunk/collective/plonetruegallery/version.txt
collective.plonetruegallery/trunk/setup.py
Log:
fade in and fade out reordered and fixed opera flickering bug
Modified: collective.plonetruegallery/trunk/collective/plonetruegallery/browser/resources/scripts/true-gallery.js
==============================================================================
--- collective.plonetruegallery/trunk/collective/plonetruegallery/browser/resources/scripts/true-gallery.js (original)
+++ collective.plonetruegallery/trunk/collective/plonetruegallery/browser/resources/scripts/true-gallery.js Fri Aug 1 21:05:07 2008
@@ -63,28 +63,54 @@
*/
tg.effects = {
fade: {
- hide: function(truegallery, image, cb){
+ hide: function(image, nextImage, cb){
+ jq(tg.selectors.galleryViewSelector).height(nextImage.height());
return image.fadeOut(tg.options.hideSpeed, cb);
},
- show: function(truegallery, image, cb){
+ show: function(image, previousImage, cb){
return image.fadeIn(tg.options.showSpeed, cb);
}
},
slide: {
- hide: function(truegallery, image, cb){
+ hide: function(image, nextImage, cb){
+ jq(tg.selectors.galleryViewSelector).height(nextImage.height());
return image.slideUp(tg.options.hideSpeed, cb);
},
- show: function(truegallery, image, cb){
+ show: function(image, previousImage, cb){
return image.slideDown(tg.options.showSpeed, cb);
}
},
show: {
- hide: function(truegallery, image, cb){
+ hide: function(image, nextImage, cb){
+ jq(tg.selectors.galleryViewSelector).height(nextImage.height());
return image.hide(tg.options.hideSpeed, cb);
},
- show: function(truegallery, image, cb){
+ show: function(image, previousImage, cb){
return image.show(tg.options.showSpeed, cb);
}
+ },
+ animate: {
+ hide: function(image, nextImage, cb){
+ jq(tg.selectors.galleryViewSelector).height(nextImage.height());
+ return image.animate({
+ width: '0px',
+ height: '0px',
+ opacity: 0.0
+ }, tg.options.hideSpeed, cb);
+ },
+ show: function(image, previousImage, cb){
+ var prevWidth = image.width();
+ var prevHeight = image.height();
+ image.width(0);
+ image.height(0);
+ image.show();
+ image.css('opacity', 0.0);
+ return image.animate({
+ width: prevWidth + 'px',
+ height: prevHeight + 'px',
+ opacity: 1.0
+ }, tg.options.showSpeed, cb);
+ }
}
};
@@ -249,12 +275,12 @@
tg.triggerLoadMoreImages();
};
- tg.hide = function(image, cb){
- return tg.effects[tg.options.hideType].hide(tg, image, cb);
+ tg.hide = function(image, nextImage, cb){
+ return tg.effects[tg.options.hideType].hide(image, nextImage, cb);
};
- tg.show = function(image, cb){
- return tg.effects[tg.options.hideType].show(tg, image, cb);
+ tg.show = function(image, previousImage, cb){
+ return tg.effects[tg.options.showType].show(image, previousImage, cb);
};
tg.getCarouselPos = function(image){
@@ -281,10 +307,10 @@
if(newImage[0] != currentImage[0] && !tg.toggling){
tg.toggling = true;
- tg.hide(currentImage.find('img'), function(){
+ tg.hide(currentImage.find('img'), newImage.find('img'), function(){
currentImage.removeClass('selected');
- tg.show(newImage.find('img'), function(){
+ tg.show(newImage.find('img'), currentImage.find('img'), function(){
tg.setNewCarouselPosition(tg.getCarouselPos(newImage));
newImage.addClass('selected');
tg.setInfo();
Modified: collective.plonetruegallery/trunk/collective/plonetruegallery/content/config.py
==============================================================================
--- collective.plonetruegallery/trunk/collective/plonetruegallery/content/config.py (original)
+++ collective.plonetruegallery/trunk/collective/plonetruegallery/content/config.py Fri Aug 1 21:05:07 2008
@@ -4,6 +4,12 @@
GALLERY_TYPES = {}
PAGE_SIZE = 10
+TRANSITIONS = (
+ ('fade', 'Fade'),
+ ('slide', 'Slide'),
+ ('show', 'Show')
+)
+
def AddGalleryType(klass):
if klass not in GALLERY_TYPES.values():
GALLERY_TYPES[klass().name()] = klass
Modified: collective.plonetruegallery/trunk/collective/plonetruegallery/content/gallery.py
==============================================================================
--- collective.plonetruegallery/trunk/collective/plonetruegallery/content/gallery.py (original)
+++ collective.plonetruegallery/trunk/collective/plonetruegallery/content/gallery.py Fri Aug 1 21:05:07 2008
@@ -79,40 +79,32 @@
required=1,
default=500
),
- IntegerField(
- name='fadeOutDuration',
- widget=IntegerField._properties['widget'](
- label="Fade out Duration",
- description="The amount of time the fading effect should take in miliseconds."
- ),
- required=1,
- default=500
- ),
StringField(
name="inTransition",
widget=SelectionWidget(
- label="Transition",
+ label="Fade In Transition",
description="Select the transition you want to use when an image is being added."
),
- vocabulary=(
- ('fade', 'Fade'),
- ('slide', 'Slide'),
- ('show', 'Show')
- ),
+ vocabulary=TRANSITIONS,
default="fade",
enforceVocabulary = True
),
+ IntegerField(
+ name='fadeOutDuration',
+ widget=IntegerField._properties['widget'](
+ label="Fade Out Duration",
+ description="The amount of time the fading effect should take in miliseconds."
+ ),
+ required=1,
+ default=500
+ ),
StringField(
name="outTransition",
widget=SelectionWidget(
- label="Transition Out",
+ label="Fade Out Transition",
description="Select the transition you want to use when an image is being removed."
),
- vocabulary=(
- ('fade', 'Fade'),
- ('slide', 'Slide'),
- ('show', 'Show')
- ),
+ vocabulary=TRANSITIONS,
default="fade",
enforceVocabulary = True
),
Modified: collective.plonetruegallery/trunk/collective/plonetruegallery/version.txt
==============================================================================
--- collective.plonetruegallery/trunk/collective/plonetruegallery/version.txt (original)
+++ collective.plonetruegallery/trunk/collective/plonetruegallery/version.txt Fri Aug 1 21:05:07 2008
@@ -1 +1 @@
-0.5.3
\ No newline at end of file
+0.5.3.1
\ No newline at end of file
Modified: collective.plonetruegallery/trunk/setup.py
==============================================================================
--- collective.plonetruegallery/trunk/setup.py (original)
+++ collective.plonetruegallery/trunk/setup.py Fri Aug 1 21:05:07 2008
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = '0.5.3'
+version = '0.5.3.1'
setup(name='collective.plonetruegallery',
version=version,
|