Permalink
Browse files

updating svn version to be in line with github

git-svn-id: http://svn.wp-plugins.org/galleria-galleria/trunk@367767 b8457f37-d9ea-0310-8a92-e5e31aec5664
  • Loading branch information...
1 parent 9caf417 commit b5205bff9bdf5b8f0f0f787e9836ea8af4e11cb5 gluten committed Apr 1, 2011
View
@@ -125,10 +125,18 @@ function galleria_galleria_admin_head() {
'value' => 'dots',
'label' => __( 'Dots' )
),
+<<<<<<< HEAD
+=======
+/*
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
'fullscreen' => array(
'value' => 'fullscreen',
'label' => __( 'Fullscreen' )
)
+<<<<<<< HEAD
+=======
+*/
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
);
$transition_options = array(
@@ -360,8 +368,13 @@ function galleria_galleria_load_scripts( ) {
if( !$add_galleria_scripts )
return;
+<<<<<<< HEAD
wp_enqueue_script('photo-galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
wp_print_scripts('photo-galleria');
+=======
+ wp_enqueue_script('galleria', plugins_url( '/js/galleria-1.2.2.min.js', __FILE__ ), array('jquery'));
+ wp_print_scripts('galleria');
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
galleria_galleria_scripts_head();
}
add_action('wp_footer', 'galleria_galleria_load_scripts' );
@@ -80,15 +80,22 @@
font: bold 12px/1.1 arial,sans-serif;
margin: 0;
color: #fff;
+<<<<<<< HEAD
+=======
+ margin-bottom: 7px;
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
}
.galleria-info-description {
font: italic 12px/1.4 georgia,serif;
margin: 0;
color: #bbb;
}
+<<<<<<< HEAD
.galleria-info-title+.galleria-info-description {
margin-top: 7px;
}
+=======
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
.galleria-info-close {
width: 9px;
height: 9px;
@@ -1,16 +1,29 @@
+<<<<<<< HEAD
/*
* Galleria Classic Theme v. 1.5 2010-10-28
* http://galleria.aino.se
*
* Copyright (c) 2010, Aino
* Licensed under the MIT license.
*/
+=======
+/**
+ * @preserve Galleria Classic Theme 2011-02-14
+ * http://galleria.aino.se
+ *
+ * Copyright (c) 2011, Aino
+ * Licensed under the MIT license.
+ */
+
+/*global jQuery, Galleria */
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
(function($) {
Galleria.addTheme({
name: 'classic',
author: 'Galleria',
+<<<<<<< HEAD
version: '1.5',
css: 'galleria.classic.css',
defaults: {
@@ -19,6 +32,15 @@ Galleria.addTheme({
// set this to false if you want to show the caption all the time:
_toggle_info: true
+=======
+ css: 'galleria.classic.css',
+ defaults: {
+ transition: 'slide',
+ thumbCrop: 'height',
+
+ // set this to false if you want to show the caption all the time:
+ _toggleInfo: true
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
},
init: function(options) {
@@ -29,6 +51,7 @@ Galleria.addTheme({
});
// cache some stuff
+<<<<<<< HEAD
var toggle = this.$('image-nav-left,image-nav-right,counter'),
info = this.$('info-link,info-close,info-text'),
click = Galleria.TOUCH ? 'touchstart' : 'click';
@@ -46,12 +69,24 @@ Galleria.addTheme({
$(this).not('.active').children().stop().fadeTo(400, .6);
});
+=======
+ var info = this.$('info-link,info-close,info-text'),
+ touch = Galleria.TOUCH,
+ click = touch ? 'touchstart' : 'click';
+
+ // show loader & counter with opacity
+ this.$('loader,counter').show().css('opacity', 0.4);
+
+ // some stuff for non-touch browsers
+ if (! touch ) {
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
this.addIdleState( this.get('image-nav-left'), { left:-50 });
this.addIdleState( this.get('image-nav-right'), { right:-50 });
this.addIdleState( this.get('counter'), { opacity:0 });
}
// toggle info
+<<<<<<< HEAD
if ( options._toggle_info ) {
info.bind( click, function() {
info.toggle();
@@ -66,17 +101,59 @@ Galleria.addTheme({
this.bind(Galleria.LOADSTART, function(e) {
if (!e.cached) {
this.$('loader').show().fadeTo(200, .4);
+=======
+ if ( options._toggleInfo === true ) {
+ info.bind( click, function() {
+ info.toggle();
+ });
+ } else {
+ info.show();
+ this.$('info-link, info-close').hide();
+ }
+
+ // bind some stuff
+ this.bind('thumbnail', function(e) {
+
+ if (! touch ) {
+ // fade thumbnails
+ $(e.thumbTarget).css('opacity', 0.6).parent().hover(function() {
+ $(this).not('.active').children().stop().fadeTo(100, 1);
+ }, function() {
+ $(this).not('.active').children().stop().fadeTo(400, 0.6);
+ });
+
+ if ( e.index === options.show ) {
+ $(e.thumbTarget).css('opacity',1);
+ }
+ }
+ });
+
+ this.bind('loadstart', function(e) {
+ if (!e.cached) {
+ this.$('loader').show().fadeTo(200, 0.4);
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
}
this.$('info').toggle( this.hasInfo() );
+<<<<<<< HEAD
$(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity',.6);
});
this.bind(Galleria.LOADFINISH, function(e) {
+=======
+ $(e.thumbTarget).css('opacity',1).parent().siblings().children().css('opacity', 0.6);
+ });
+
+ this.bind('loadfinish', function(e) {
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d
this.$('loader').fadeOut(200);
});
}
});
+<<<<<<< HEAD
})(jQuery);
+=======
+}(jQuery));
+>>>>>>> 35c5c655cc18e3740580345c3e138092eb06e20d

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit b5205bf

Please sign in to comment.