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

tweaks for developing on this branch

Browse source
This commit is contained in:
Connor Turland 2017-02-06 03:41:28 +00:00
parent 7951f08e45
commit f49a674566
4 changed files with 25 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,17 +164,16 @@ jQuery.browser = browser;
// START METAMAPS CODE // START METAMAPS CODE
// Add code that makes tab and shift+tab scroll through metacodes // Add code that makes tab and shift+tab scroll through metacodes
$('.new_topic').bind('keydown',this,function(event){ $('.new_topic').bind('keydown',this,function(event){
if (event.keyCode == 9 && event.shiftKey) { if (event.keyCode == 9) {
$(container).show() if (event.shiftKey) {
event.data.rotate(-1); event.data.rotate(-1)
event.preventDefault(); } else {
event.stopPropagation(); event.data.rotate(1)
} else if (event.keyCode == 9) { }
$(container).show() event.preventDefault();
event.data.rotate(1); event.stopPropagation();
event.preventDefault(); Metamaps.Create.newTopic.metacode = $(items[event.data.frontIndex].image).attr('data-id');
event.stopPropagation(); }
}
}); });
// END METAMAPS CODE // END METAMAPS CODE
@ -182,14 +181,14 @@ jQuery.browser = browser;
if (options.mouseWheel) if (options.mouseWheel)
{ {
// 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) {
@ -256,11 +255,8 @@ 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 $(options.titleBox).html( $(items[this.frontIndex].image).attr('title'));
Metamaps.Create.newTopic.setMetacode($(items[this.frontIndex].image).attr('data-id')) $(options.altBox).html( $(items[this.frontIndex].image).attr('alt'));
// NOT METAMAPS CODE
//$(options.titleBox).html( $(items[this.frontIndex].image).attr('title'));
//$(options.altBox).html( $(items[this.frontIndex].image).attr('alt'));
}; };
this.go = function() this.go = function()
@ -273,10 +269,7 @@ jQuery.browser = browser;
this.stop = function() this.stop = function()
{ {
clearTimeout(this.controlTimer); clearTimeout(this.controlTimer);
this.controlTimer = 0; this.controlTimer = 0;
// METAMAPS CODE
$(container).hide()
// END METAMAPS CODE
}; };
@ -397,7 +390,7 @@ jQuery.browser = browser;
} }
// If all images have valid widths and heights, we can stop checking. // If all images have valid widths and heights, we can stop checking.
clearInterval(this.tt); clearInterval(this.tt);
// METAMAPS COMMENT this.showFrontText(); this.showFrontText();
this.autoRotate(); this.autoRotate();
this.updateAll(); this.updateAll();

42
app/assets/stylesheets/metacode-select.scss.erb
View file

@ -1,42 +0,0 @@
#metacodeSelector {
display: none;
}
.metacodeSelect {
border-top: 1px solid #DDD;
padding: 0;
background: #FFF;
.metacodeFilterInput {
width: 100px;
outline: none;
border: 0;
padding: 8px;
font-size: 14px;
line-height: 14px;
color: #424242;
font-family: 'din-medium', helvetica, sans-serif;
}
.metacodeList {
list-style: none;
background: #FFF;
li {
padding: 8px;
cursor: pointer;
&:hover, &.keySelect {
background: #4CAF50;
}
}
img {
width: 24px;
height: 24px;
display: inline-block;
vertical-align: middle;
padding-right: 6px;
}
}
}

2
app/policies/map_policy.rb
View file

@ -22,7 +22,7 @@ class MapPolicy < ApplicationPolicy
end end
def conversation? def conversation?
show? && %w(connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com ishanshapiro@gmail.com).include?(user.email) show? && %w(admin@admin.com user@user.com connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com ishanshapiro@gmail.com).include?(user.email)
end end
def create? def create?

4
webpack.config.js
View file

@ -40,10 +40,10 @@ module.exports = {
] ]
}, },
entry: { entry: {
'metamaps.bundle': './frontend/src/index.js' 'metamaps.secret.bundle': './frontend/src/index.js'
}, },
output: { output: {
path: './app/assets/javascripts/webpacked', path: './app/assets/javascripts',
filename: '[name].js', filename: '[name].js',
devtoolModuleFilenameTemplate: '[absolute-resource-path]' devtoolModuleFilenameTemplate: '[absolute-resource-path]'
} }