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

lowered synapse alpha

Browse source
This commit is contained in:
Connor Turland 2013-01-23 23:40:06 -05:00
parent 57219f0d1e
commit 3433e1f05c
11 changed files with 84 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/Jit/graphsettings-event-handlers.js
View file

@ -60,7 +60,7 @@ function selectNodeOnClickHandler(node, e) {
} }
//trigger animation to final styles //trigger animation to final styles
Mconsole.fx.animate({ Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'], modes: ['edge-property:lineWidth:color:alpha'],
duration: 500 duration: 500
}); });
Mconsole.plot(); Mconsole.plot();

13
app/assets/javascripts/Jit/graphsettings.js
View file

@ -34,7 +34,8 @@ function graphSettings(type) {
overridable: true, overridable: true,
color: '#222222', color: '#222222',
type: 'customEdge', type: 'customEdge',
lineWidth: 2 lineWidth: 2,
alpha: 0.4
}, },
//Native canvas text styling //Native canvas text styling
Label: { Label: {
@ -331,10 +332,11 @@ function onMouseEnter(edge) {
if (!showDesc) { if (!showDesc) {
edge.setDataset('end', { edge.setDataset('end', {
lineWidth: 4, lineWidth: 4,
color: '#222222' color: '#222222',
alpha: 1
}); });
Mconsole.fx.animate({ Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'], modes: ['edge-property:lineWidth:color:alpha'],
duration: 100 duration: 100
}); });
Mconsole.plot(); Mconsole.plot();
@ -347,10 +349,11 @@ function onMouseLeave(edge) {
if (!showDesc) { if (!showDesc) {
edge.setDataset('end', { edge.setDataset('end', {
lineWidth: 2, lineWidth: 2,
color: '#222222' color: '#222222',
alpha: 0.4
}); });
Mconsole.fx.animate({ Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'], modes: ['edge-property:lineWidth:color:alpha'],
duration: 100 duration: 100
}); });
} }

13
app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js
View file

@ -125,10 +125,11 @@ function selectEdge(edge) {
edge.setData('showDesc', true, 'current'); edge.setData('showDesc', true, 'current');
edge.setDataset('end', { edge.setDataset('end', {
lineWidth: 4, lineWidth: 4,
color: '#FFFFFF' color: '#FFFFFF',
alpha: 1
}); });
Mconsole.fx.animate({ Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'], modes: ['edge-property:lineWidth:color:alpha'],
duration: 100 duration: 100
}); });
} }
@ -141,18 +142,20 @@ function deselectEdge(edge) {
edge.setData('showDesc', false, 'current'); edge.setData('showDesc', false, 'current');
edge.setDataset('end', { edge.setDataset('end', {
lineWidth: 2, lineWidth: 2,
color: '#222222' color: '#222222',
alpha: 0.4
}); });
if (MetamapsModel.edgeHoveringOver == edge) { if (MetamapsModel.edgeHoveringOver == edge) {
edge.setDataset('end', { edge.setDataset('end', {
lineWidth: 4, lineWidth: 4,
color: '#222222' color: '#222222',
alpha: 1
}); });
} }
Mconsole.fx.animate({ Mconsole.fx.animate({
modes: ['edge-property:lineWidth:color'], modes: ['edge-property:lineWidth:color:alpha'],
duration: 100 duration: 100
}); });
} }

14
app/helpers/topics_helper.rb
View file

@ -57,6 +57,7 @@ module TopicsHelper
@synapsedata['$userid'] = synapse.user.id @synapsedata['$userid'] = synapse.user.id
@synapsedata['$username'] = synapse.user.name @synapsedata['$username'] = synapse.user.name
@synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()] @synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
@synapsedata['$permission'] = synapse.permission
json.data @synapsedata json.data @synapsedata
end end
@ -72,6 +73,7 @@ module TopicsHelper
@topicdata['$inmaps'] = @inmaps @topicdata['$inmaps'] = @inmaps
@topicdata['$userid'] = topic.user.id @topicdata['$userid'] = topic.user.id
@topicdata['$username'] = topic.user.name @topicdata['$username'] = topic.user.name
@topicdata['$permission'] = topic.permission
json.data @topicdata json.data @topicdata
json.id topic.id json.id topic.id
json.name topic.name json.name topic.name
@ -99,9 +101,13 @@ module TopicsHelper
@synapsedata = Hash.new @synapsedata = Hash.new
@synapsedata['$desc'] = synapse.desc @synapsedata['$desc'] = synapse.desc
@synapsedata['$category'] = synapse.category @synapsedata['$showDesc'] = false
@synapsedata['$userid'] = synapse.user.id @synapsedata['$category'] = synapse.category
@synapsedata['$username'] = synapse.user.name @synapsedata['$id'] = synapse.id
@synapsedata['$userid'] = synapse.user.id
@synapsedata['$username'] = synapse.user.name
@synapsedata['$direction'] = [synapse.node1_id.to_s(), synapse.node2_id.to_s()]
@synapsedata['$permission'] = synapse.permission
json.data @synapsedata json.data @synapsedata
end end
@ -117,7 +123,7 @@ module TopicsHelper
@topicdata['$inmaps'] = @inmaps @topicdata['$inmaps'] = @inmaps
@topicdata['$userid'] = topic.user.id @topicdata['$userid'] = topic.user.id
@topicdata['$username'] = topic.user.name @topicdata['$username'] = topic.user.name
@topicdata['$permission'] = topic.permission
json.data @topicdata json.data @topicdata
json.id topic.id json.id topic.id
json.name topic.name json.name topic.name

BIN
public/assets/application-53e9765262d6851fbadb15b48dbcebf4.css.gz
View file

Binary file not shown.

34
public/assets/application-ea5e981446f3d58ff2d6d034b0632809.js Normal file
View file

File diff suppressed because one or more lines are too long

BIN
public/assets/application-ea5e981446f3d58ff2d6d034b0632809.js.gz Normal file
View file

Binary file not shown.

BIN
public/assets/application.css.gz
View file

Binary file not shown.

42
public/assets/application.js
View file

File diff suppressed because one or more lines are too long

BIN
public/assets/application.js.gz
View file

Binary file not shown.

4
public/assets/manifest.yml
View file

@ -143,8 +143,8 @@ ui-icons_cd0a0a_256x240.png: ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a
ui-icons_cd0a0a_256x240/index.png: ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png ui-icons_cd0a0a_256x240/index.png: ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
wildcard.png: wildcard-0987c616d3d98b5e5a4cc29e1c5f3123.png wildcard.png: wildcard-0987c616d3d98b5e5a4cc29e1c5f3123.png
wildcard/index.png: wildcard-0987c616d3d98b5e5a4cc29e1c5f3123.png wildcard/index.png: wildcard-0987c616d3d98b5e5a4cc29e1c5f3123.png
application.js: application-e381eaa7bb497b297b36147cfd629abb.js application.js: application-ea5e981446f3d58ff2d6d034b0632809.js
application/index.js: application-e381eaa7bb497b297b36147cfd629abb.js application/index.js: application-ea5e981446f3d58ff2d6d034b0632809.js
scroll/mCSB_buttons.png: scroll/mCSB_buttons-81b42ba0c7dc3ded1f392318bb8efd8a.png scroll/mCSB_buttons.png: scroll/mCSB_buttons-81b42ba0c7dc3ded1f392318bb8efd8a.png
scroll/mCSB_buttons/index.png: scroll/mCSB_buttons-81b42ba0c7dc3ded1f392318bb8efd8a.png scroll/mCSB_buttons/index.png: scroll/mCSB_buttons-81b42ba0c7dc3ded1f392318bb8efd8a.png
application.css: application-53e9765262d6851fbadb15b48dbcebf4.css application.css: application-53e9765262d6851fbadb15b48dbcebf4.css