glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make metacode selector reliable after switching metacode sets (#816)

Browse source
This commit is contained in:
Devin Howard 2016-10-23 22:11:26 +08:00 committed by GitHub
parent 87dc20fa50
commit 5db8e27496
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/assets/javascripts/lib/cloudcarousel.js
View file

@ -179,13 +179,13 @@ jQuery.browser = browser;
{ {
// START METAMAPS CODE // START METAMAPS CODE
$('body').bind('mousewheel',this,function(event, delta) { $('body').bind('mousewheel',this,function(event, delta) {
if (Metamaps.Create.newTopic.beingCreated && if (Metamaps.Create.newTopic.beingCreated &&
!Metamaps.Create.isSwitchingSet && !Metamaps.Create.isSwitchingSet &&
!Metamaps.Create.newTopic.pinned) { !Metamaps.Create.newTopic.pinned) {
event.data.rotate(delta); event.data.rotate(delta);
return false; return false;
} }
}); });
// END METAMAPS CODE // END METAMAPS CODE
/* ORIGINAL CODE /* ORIGINAL CODE
$(container).bind('mousewheel',this,function(event, delta) { $(container).bind('mousewheel',this,function(event, delta) {
@ -194,7 +194,7 @@ jQuery.browser = browser;
}); });
*/ */
} }
$(container).bind('mouseover click',this,function(event){ $(container).unbind('mouseover click').bind('mouseover click',this,function(event){
clearInterval(event.data.autoRotateTimer); // Stop auto rotation if mouse over. clearInterval(event.data.autoRotateTimer); // Stop auto rotation if mouse over.
var text = $(event.target).attr('alt'); var text = $(event.target).attr('alt');
@ -208,22 +208,27 @@ jQuery.browser = browser;
//$(options.titleBox).html( ($(event.target).attr('title') )); //$(options.titleBox).html( ($(event.target).attr('title') ));
if ( options.bringToFront && event.type == 'click' ) if ( options.bringToFront && event.type == 'click' )
{ {
$(options.titleBox).html( ($(event.target).attr('title') )); options.titleBox).html( ($(event.target).attr('title') ));
// METAMAPS CODE // START METAMAPS CODE
Metamaps.Create.newTopic.metacode = $(event.target).attr('data-id'); Metamaps.Create.newTopic.metacode = $(event.target).attr('data-id');
// NOT METAMAPS CODE // END METAMAPS CODE
var idx = $(event.target).data('itemIndex'); var idx = $(event.target).data('itemIndex');
var frontIndex = event.data.frontIndex; var frontIndex = event.data.frontIndex;
//var diff = idx - frontIndex; //var diff = idx - frontIndex;
var diff = (idx - frontIndex) % images.length; var diff = (idx - frontIndex) % images.length;
if (Math.abs(diff) > images.length / 2) { if (Math.abs(diff) > images.length / 2) {
diff += (diff > 0 ? -images.length : images.length); diff += (diff > 0 ? -images.length : images.length);
} }
event.data.rotate(-diff); event.data.rotate(-diff);
} }
} }
}); });
// START METAMAPS CODE - initialize newTopic.metacode
var first = $(this.container).find('img').get(0)
Metamaps.Create.newTopic.metacode = $(first).data('id')
// END METAMAPS CODE
// If we have moved out of a carousel item (or the container itself), // If we have moved out of a carousel item (or the container itself),
// restore the text of the front item in 1 second. // restore the text of the front item in 1 second.
$(container).bind('mouseout',this,function(event){ $(container).bind('mouseout',this,function(event){
@ -247,11 +252,6 @@ jQuery.browser = browser;
this.showFrontText = function() this.showFrontText = function()
{ {
if ( items[this.frontIndex] === undefined ) { return; } // Images might not have loaded yet. if ( items[this.frontIndex] === undefined ) { return; } // Images might not have loaded yet.
// METAMAPS CODE
Metamaps.Create.newTopic.metacode = $(items[this.frontIndex].image).attr('data-id');
//$('img.cloudcarousel').css({"background":"none", "width":"","height":""});
//$(items[this.frontIndex].image).css({"width":"45px","height":"45px"});
// NOT METAMAPS CODE
$(options.titleBox).html( $(items[this.frontIndex].image).attr('title')); $(options.titleBox).html( $(items[this.frontIndex].image).attr('title'));
$(options.altBox).html( $(items[this.frontIndex].image).attr('alt')); $(options.altBox).html( $(items[this.frontIndex].image).attr('alt'));
}; };
@ -425,4 +425,4 @@ jQuery.browser = browser;
return this; return this;
}; };
})(jQuery); })(jQuery);