Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to scroll village / storesContainer via keyboard #224

Merged
merged 5 commits into from
Feb 14, 2015
Merged

Add ability to scroll village / storesContainer via keyboard #224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29932a9
Merge pull request #1 from anubisthejackle/issue35
anubisthejackle Feb 6, 2015
3d00ed3
Add scrolling via keyboard
anubisthejackle Feb 7, 2015
2d3daa5
Move movement functions to Engine. Create scrollable Path sidebar
anubisthejackle Feb 7, 2015
f2b8ad6
Merge remote-tracking branch 'upstream/master' into issue115
anubisthejackle Feb 10, 2015
340851a
Updated against suggestions
anubisthejackle Feb 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add scrolling via keyboard
  • Loading branch information
@anubisthejackle
anubisthejackle committed Feb 7, 2015
commit 3d00ed3c40e5eadff2d16df0b2f9486c90dd01af
15 changes: 12 additions & 3 deletions script/engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,16 @@
switch(e.which) {
case 38: // Up
case 87:
if(Engine.activeModule == Outside){
Engine.activeModule.scrollSidebar('up');
}
Engine.log('up');
break;
case 40: // Down
case 83:
if(Engine.activeModule == Outside){
Engine.activeModule.scrollSidebar('down');
}
Engine.log('down');
break;
case 37: // Left
Expand All @@ -605,17 +611,20 @@
Engine.travelTo(Path);
else if(Engine.activeModule == Path && Outside.tab)
Engine.travelTo(Outside);
else if(Engine.activeModule == Outside && Room.tab)
else if(Engine.activeModule == Outside && Room.tab){
Engine.activeModule.scrollSidebar('left', true);
Engine.travelTo(Room);
}
Engine.log('left');
break;
case 39: // Right
case 68:
if(Engine.activeModule == Room && Outside.tab)
Engine.travelTo(Outside);
else if(Engine.activeModule == Outside && Path.tab)
else if(Engine.activeModule == Outside && Path.tab){
Engine.activeModule.scrollSidebar('right', true);
Engine.travelTo(Path);
else if(Engine.activeModule == Path && Ship.tab)
}else if(Engine.activeModule == Path && Ship.tab)
Engine.travelTo(Ship);
Engine.log('right');
break;
Expand Down
60 changes: 59 additions & 1 deletion script/outside.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
var Outside = {
name: _("Outside"),

_STORES_OFFSET: 0,
_GATHER_DELAY: 60,
_TRAPS_DELAY: 90,
_POP_DELAY: [0.5, 3],
Expand Down Expand Up @@ -439,7 +440,7 @@ var Outside = {
this.setTitle();

if(!ignoreStores && Engine.activeModule === Outside && village.children().length > 1) {
$('#storesContainer').css({top: village.height() + 26 + 'px'});
$('#storesContainer').css({top: village.height() + 26 + Outside._STORES_OFFSET + 'px'});
}
},

Expand Down Expand Up @@ -611,5 +612,62 @@ var Outside = {
Outside.updateWorkersView();
Outside.updateVillageIncome();
};
},

scrollSidebar: function(direction, reset) {

if( typeof reset != "undefined" ){
$('#village').css('top', '0px');
$('#storesContainer').css('top', '224px');
Outside._STORES_OFFSET = 0;
return false;
}

var momentum = 10;

// If they hit up, we scroll everything down
if( direction == 'up' )
momentum = momentum * -1;

/* Let's stop scrolling if the top or bottom bound is in the viewport, based on direction */
if( direction == 'down' && inView( direction, $('#village') ) ){
console.log(direction);
console.log('IN VIEW');
return false;
}else if( direction == 'up' && inView( direction, $('#storesContainer') ) ){
console.log(direction);
console.log('IN VIEW');
return false;
}

scrollByX( $('#village'), momentum );
scrollByX( $('#storesContainer'), momentum );
Outside._STORES_OFFSET += momentum;

}
};
function inView(dir, elem){

var scTop = $('#main').offset().top;
var scBot = scTop + $('#main').height();

var elTop = elem.offset().top;
var elBot = elTop + elem.height();

if( dir == 'up' ){
// STOP MOVING IF BOTTOM OF ELEMENT IS VISIBLE IN SCREEN
return ( elBot < scBot );
}else if( dir == 'down' ){
return ( elTop > scTop );
}else{
return ( ( elBot <= scBot ) && ( elTop >= scTop ) );
}

}

function scrollByX(elem, x){

var elTop = parseInt( elem.css('top'), 10 );
elem.css( 'top', ( elTop + x ) + "px" );

}