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

removed a bunch of unnecessary js.coffee files with nothing in them

Browse source
This commit is contained in:
Connor Turland 2014-02-04 14:55:26 -05:00
parent 5271c1ea3d
commit 8749ba8bbe
18 changed files with 64 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app.js.coffee
View file

@ -1,5 +0,0 @@
$ () ->
start = () ->
window.app.realtime.connect();
start();

2
app/assets/javascripts/config.js.coffee
View file

@ -1,2 +0,0 @@
window.app =
{}

3
app/assets/javascripts/main.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/mapping.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

10
app/assets/javascripts/maps.js.coffee
View file

@ -1,4 +1,5 @@
window.app.addTopicToMap = (topic) ->
window.realtime = {}
window.realtime.addTopicToMap = (topic) ->
Mconsole.graph.addNode(topic)
tempForT = Mconsole.graph.getNode(topic.id)
tempForT.setData('dim', 1, 'start')
@ -12,12 +13,11 @@ window.app.addTopicToMap = (topic) ->
Mconsole.fx.plotNode(tempForT, Mconsole.canvas)
Mconsole.labels.plotLabel(Mconsole.canvas, tempForT, Mconsole.config)
window.app.updateTopicOnMap = (topic) ->
window.realtime.updateTopicOnMap = (topic) ->
tempForT = Mconsole.graph.getNode(topic.id)
tempForT.data = topic.data
tempForT.name = topic.name
$('#topic_' + topic.id + '_label').find('.label').html(topic.name);
if MetamapsModel.showcardInUse == topic.id
populateShowCard(tempForT)
@ -35,7 +35,7 @@ window.app.updateTopicOnMap = (topic) ->
duration: 500
})
window.app.addSynapseToMap = (synapse) ->
window.realtime.addSynapseToMap = (synapse) ->
Node1 = Mconsole.graph.getNode(synapse.data.$direction[0])
Node2 = Mconsole.graph.getNode(synapse.data.$direction[1])
Mconsole.graph.addAdjacence(Node1, Node2, {})
@ -54,7 +54,7 @@ window.app.addSynapseToMap = (synapse) ->
duration: 500
})
window.app.updateSynapseOnMap = (synapse) ->
window.realtime.updateSynapseOnMap = (synapse) ->
tempForS = Mconsole.graph.getAdjacence(synapse.data.$direction[0], synapse.data.$direction[1])
wasShowDesc = tempForS.data.$showDesc

0
app/assets/javascripts/metamaps_pack.js.coffee
View file

6
app/assets/javascripts/realtime.js.coffee
View file

@ -1,6 +0,0 @@
window.app.realtime =
connect : () ->
window.app.socket = io.connect('http://gentle-savannah-1303.herokuapp.com');
window.app.socket.on 'connect', () ->
subscribeToRooms()
console.log('socket connected')

3
app/assets/javascripts/sessions.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/synapses.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

6
app/assets/javascripts/topics.js.coffee
View file

@ -1,6 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
jQuery ->
$('.authenticated div.permission.canEdit .best_in_place').best_in_place()

3
app/assets/javascripts/users.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

19
app/views/maps/show.html.erb
View file

@ -205,6 +205,9 @@
bindFilterHover();
bindInfoHover();
// initialize best_in_place editing
$('.authenticated div.permission.canEdit .best_in_place').best_in_place();
$('.showcard').draggable({ handle: ".metacodeImage" });
$('#showcard').resizable({
maxHeight: 500,
@ -242,19 +245,23 @@
initialize("chaotic", true);
});
}
window.realtime.socket = io.connect('http://gentle-savannah-1303.herokuapp.com');
window.realtime.socket.on('connect', function() {
subscribeToRooms();
console.log('socket connected');
});
function subscribeToRooms() {
window.app.socket.on('maps-' + mapid, function(data) {
window.realtime.socket.on('maps-' + mapid, function(data) {
//as long as you weren't the origin of the changes, update your map
if (data.origin != userid && goRealtime) {
if (data.resource == 'Topic') {
topic = $.parseJSON(data.obj);
if (data.action == 'create') {
window.app.addTopicToMap(topic);
window.realtime.addTopicToMap(topic);
}
else if (data.action == 'update' && Mconsole.graph.getNode(topic.id) != 'undefined') {
window.app.updateTopicOnMap(topic);
window.realtime.updateTopicOnMap(topic);
}
else if (data.action == 'destroy' && Mconsole.graph.getNode(topic.id) != 'undefined') {
hideNode(topic.id)
@ -266,11 +273,11 @@
synapse = $.parseJSON(data.obj);
if (data.action == 'create') {
window.app.addSynapseToMap(synapse);
window.realtime.addSynapseToMap(synapse);
}
else if (data.action == 'update' &&
Mconsole.graph.getAdjacence(synapse.data.$direction['0'], synapse.data.$direction['1']) != 'undefined') {
window.app.updateSynapseOnMap(synapse);
window.realtime.updateSynapseOnMap(synapse);
}
else if (data.action == 'destroy' &&
Mconsole.graph.getAdjacence(synapse.data.$direction['0'], synapse.data.$direction['1']) != 'undefined') {

3
app/views/topics/show.html.erb
View file

@ -155,6 +155,9 @@
bindWandHover();
bindFilterHover();
// initialize best_in_place editing
$('.authenticated div.permission.canEdit .best_in_place').best_in_place();
$('.showcard').draggable({ handle: ".icon" });
$('#showcard').resizable({
maxHeight: 500,

36
public/assets/application-b6d9ec9c3fd91810dfe2579fa589529d.js Normal file
View file

File diff suppressed because one or more lines are too long

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

Binary file not shown.

10
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

@ -209,8 +209,8 @@ WebSocketMain.swf: WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf
WebSocketMain/index.swf: WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf
WebSocketMainInsecure.swf: WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf
WebSocketMainInsecure/index.swf: WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf
application.js: application-6c43f7a71ebd80496a8f18f5b1789324.js
application/index.js: application-6c43f7a71ebd80496a8f18f5b1789324.js
application.js: application-b6d9ec9c3fd91810dfe2579fa589529d.js
application/index.js: application-b6d9ec9c3fd91810dfe2579fa589529d.js
scroll/mCSB_buttons.png: scroll/mCSB_buttons-0642ce29bb568932e832d150141614e6.png
scroll/mCSB_buttons/index.png: scroll/mCSB_buttons-0642ce29bb568932e832d150141614e6.png
Fonts/Lato-Lig-webfont.eot: Fonts/Lato-Lig-webfont-1435188a694a7d5e29cf4a3288ff3e36.eot