Ctrl+H
Ctrl+M
Ctrl+D
- commons \ diff --git a/app/assets/javascripts/src/Metamaps.Router.js b/app/assets/javascripts/src/Metamaps.Router.js index 466326d2..6d9e2012 100644 --- a/app/assets/javascripts/src/Metamaps.Router.js +++ b/app/assets/javascripts/src/Metamaps.Router.js @@ -6,11 +6,12 @@ routes: { "": "home", // #home "explore/:section": "explore", // #explore/active + "explore/:section/:id": "explore", // #explore/mapper/1234 "maps/:id": "maps" // #maps/7 }, home: function () { - if (Metamaps.Active.Mapper) document.title = 'My Maps | Metamaps'; + if (Metamaps.Active.Mapper) document.title = 'Explore Active Maps | Metamaps'; else document.title = 'Home | Metamaps'; Metamaps.currentSection = ""; @@ -25,7 +26,7 @@ Metamaps.Famous.yield.hide(); - Metamaps.Famous.explore.set('mine'); + Metamaps.Famous.explore.set('active'); Metamaps.Famous.maps.resetScroll(); // sets the scroll back to the top Metamaps.Famous.explore.show(); @@ -34,9 +35,9 @@ Metamaps.GlobalUI.Search.open(); Metamaps.GlobalUI.Search.lock(); - Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps.Mine ); - if (Metamaps.Maps.Mine.length === 0) { - Metamaps.Maps.Mine.getMaps(); // this will trigger an explore maps render + Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps.Active ); + if (Metamaps.Maps.Active.length === 0) { + Metamaps.Maps.Active.getMaps(); // this will trigger an explore maps render } else { Metamaps.Views.exploreMaps.render(); @@ -64,13 +65,29 @@ Metamaps.Active.Map = null; Metamaps.Active.Topic = null; }, - explore: function (section) { + explore: function (section, id) { // just capitalize the variable section - // either 'mine', 'featured', or 'active' + // either 'featured', 'mapper', or 'active' var capitalize = section.charAt(0).toUpperCase() + section.slice(1); - document.title = 'Explore ' + capitalize + ' Maps | Metamaps'; + if (section === "featured" || section === "active") { + document.title = 'Explore ' + capitalize + ' Maps | Metamaps'; + } + else if (section === "mapper") { + $.ajax({ + url: "/users/" + id + ".json", + success: function (response) { + document.title = response.name + ' | Metamaps'; + }, + error: function () { + + } + }); + } + else if (section === "mine") { + document.title = 'Explore My Maps | Metamaps'; + } $('.wrapper').removeClass('homePage mapPage topicPage'); $('.wrapper').addClass('explorePage'); @@ -78,6 +95,17 @@ Metamaps.currentSection = "explore"; Metamaps.currentPage = section; + // this will mean it's a mapper page being loaded + if (id) { + if (Metamaps.Maps.Mapper.mapperId !== id) { + // empty the collection if we are trying to load the maps + // collection of a different mapper than we had previously + Metamaps.Maps.Mapper.reset(); + Metamaps.Maps.Mapper.page = 1; + } + Metamaps.Maps.Mapper.mapperId = id; + } + Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps[capitalize] ); if (Metamaps.Maps[capitalize].length === 0) { Metamaps.Loading.show(); @@ -86,7 +114,12 @@ }, 300); // wait 300 milliseconds till the other animations are done to do the fetch } else { - Metamaps.Views.exploreMaps.render(); + if (id) { + Metamaps.Views.exploreMaps.fetchUserThenRender(); + } + else { + Metamaps.Views.exploreMaps.render(); + } } Metamaps.GlobalUI.Search.open(); @@ -96,7 +129,7 @@ Metamaps.Famous.maps.resetScroll(); // sets the scroll back to the top Metamaps.Famous.maps.show(); - Metamaps.Famous.explore.set(section); + Metamaps.Famous.explore.set(section, id); Metamaps.Famous.explore.show(); Metamaps.Famous.viz.hide(); @@ -172,34 +205,37 @@ Metamaps.Router = new Router(); + + Metamaps.Router.intercept = function (evt) { + var segments; + + var href = { + prop: $(this).prop("href"), + attr: $(this).attr("href") + }; + var root = location.protocol + "//" + location.host + Backbone.history.options.root; + + if (href.prop && href.prop === root) href.attr = ""; + + if (href.prop && href.prop.slice(0, root.length) === root) { + evt.preventDefault(); + + segments = href.attr.split('/'); + segments.splice(0,1); // pop off the element created by the first / + + if (href.attr === "") Metamaps.Router.home(); + else { + Metamaps.Router[segments[0]](segments[1], segments[2]); + } + } + }; + Metamaps.Router.init = function () { Backbone.history.start({ silent: true, pushState: true, root: '/' }); - $(document).on("click", "a:not([data-bypass])", function (evt) { - var segments; - - var href = { - prop: $(this).prop("href"), - attr: $(this).attr("href") - }; - var root = location.protocol + "//" + location.host + Backbone.history.options.root; - - if (href.prop && href.prop === root) href.attr = "" - - if (href.prop && href.prop.slice(0, root.length) === root) { - evt.preventDefault(); - - segments = href.attr.split('/'); - segments.splice(0,1); // pop off the element created by the first / - - if (href.attr === "") Metamaps.Router.home(); - else { - Metamaps.Router[segments[0]](segments[1]); - } - } - }); - } + $(document).on("click", "a:not([data-bypass])", Metamaps.Router.intercept); + }; })(); diff --git a/app/assets/javascripts/src/Metamaps.Views.js b/app/assets/javascripts/src/Metamaps.Views.js index 3d00991e..00f1b7f6 100644 --- a/app/assets/javascripts/src/Metamaps.Views.js +++ b/app/assets/javascripts/src/Metamaps.Views.js @@ -5,6 +5,20 @@ Metamaps.Views.init = function () { + Metamaps.Views.MapperCard = Backbone.View.extend({ + + template: Hogan.compile( $('#mapperCardTemplate').html() ), + + tagNamea: "div", + + className: "mapper", + + render: function () { + this.$el.html( this.template.render(this.model) ); + return this; + } + }); + Metamaps.Views.MapCard = Backbone.View.extend({ template: Hogan.compile( $('#mapCardTemplate').html() ), @@ -40,12 +54,20 @@ Metamaps.Views.init = function () { this.listenTo(this.collection, 'successOnFetch', this.handleSuccess); this.listenTo(this.collection, 'errorOnFetch', this.handleError); }, - render: function () { + render: function (mapperObj) { var that = this; this.el.innerHTML = ""; + // in case it is a page where we have to display the mapper card + if (mapperObj) { + var view = new Metamaps.Views.MapperCard({ model: mapperObj }); + + that.el.appendChild( view.render().el ); + } + + this.collection.each(function (map) { var view = new Metamaps.Views.MapCard({ model: map }); @@ -69,20 +91,48 @@ Metamaps.Views.init = function () { } Metamaps.Loading.hide(); - setTimeout(function(){ - var path = Metamaps.currentSection == "" ? "" : "/explore/" + Metamaps.currentPage; + + clearTimeout(Metamaps.routerTimeoutFunctionIds); + Metamaps.routerTimeoutId = setTimeout((function(localCurrentPage){ return function(){ + var path = (Metamaps.currentSection == "") ? "" : "/explore/" + localCurrentPage; + + // alter url if for mapper profile page + if (that.collection && that.collection.mapperId) { + path += "/" + that.collection.mapperId; + } + Metamaps.Router.navigate(path); - }, 500); + }})(Metamaps.currentPage), 500); }, handleSuccess: function () { - this.render(); + var that = this; + + if (this.collection && this.collection.id === "mapper") { + this.fetchUserThenRender(); + } + else { + this.render(); + } }, handleError: function () { console.log('error loading maps!'); //TODO + }, + fetchUserThenRender: function () { + var that = this; + // first load the mapper object and then call the render function + $.ajax({ + url: "/users/" + this.collection.mapperId + "/details.json", + success: function (response) { + that.render(response); + }, + error: function () { + + } + }); } }); Metamaps.Views.exploreMaps = new mapsWrapper(); }; -})(); \ No newline at end of file +})(); diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 2e2a98f7..d39dd461 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -749,6 +749,10 @@ Metamaps.Create = { if (datum.id) { // if they clicked on an existing synapse get it Metamaps.Synapse.getSynapseFromAutocomplete(datum.id); } + else { + Metamaps.Create.newSynapse.description = datum.value; + Metamaps.Synapse.createSynapseLocally(); + } }); }, beingCreated: false, @@ -1089,6 +1093,36 @@ Metamaps.TopicCard = { $('.showcard .yourTopic .mapPerm').click(openPermissionSelect); $('.showcard').click(hidePermissionSelect); } + + $('.links .mapCount').unbind().click(function(event){ + $('.mapCount .tip').toggle(); + $('.showcard .hoverTip').toggleClass('hide'); + event.stopPropagation(); + }); + $('.mapCount .tip').unbind().click(function(event){ + event.stopPropagation(); + }); + $('.showcard').unbind('.hideTip').bind('click.hideTip', function(){ + $('.mapCount .tip').hide(); + $('.showcard .hoverTip').removeClass('hide'); + }); + + $('.mapCount .tip li a').click(Metamaps.Router.intercept); + + var originalText = $('.showMore').html(); + $('.mapCount .tip .showMore').unbind().toggle( + function(event){ + $('.extraText').toggleClass("hideExtra"); + $('.showMore').html('Show less...'); + }, + function(event){ + $('.extraText').toggleClass("hideExtra"); + $('.showMore').html(originalText); + }); + + $('.mapCount .tip showMore').unbind().click(function(event){ + event.stopPropagation(); + }); }, handleInvalidLink: function() { var self = Metamaps.TopicCard; @@ -1162,6 +1196,27 @@ Metamaps.TopicCard = { nodeValues.attachments = ''; } + var inmapsAr = topic.get("inmaps"); + var inmapsLinks = topic.get("inmapsLinks"); + nodeValues.inmaps =''; + if (inmapsAr.length < 6) { + for (i = 0; i < inmapsAr.length; i++) { + var url = "/maps/" + inmapsLinks[i]; + nodeValues.inmaps += '
- ' + inmapsAr[i]+ ' '; + } + } + else { + for (i = 0; i < 5; i++){ + var url = "/maps/" + inmapsLinks[i]; + nodeValues.inmaps += '
- ' + inmapsAr[i] + ' '; + } + extra = inmapsAr.length - 5; + nodeValues.inmaps += '
- See ' + extra + ' more... ' + for (i = 5; i < inmapsAr.length; i++){ + var url = "/maps/" + inmapsLinks[i]; + nodeValues.inmaps += '
- ' + inmapsAr[i]+ ' '; + } + } nodeValues.permission = topic.get("permission"); nodeValues.mk_permission = topic.get("permission").substring(0, 2); nodeValues.map_count = topic.get("map_count").toString(); @@ -1273,7 +1328,12 @@ Metamaps.SynapseCard = { //if edge data is blank or just whitespace, populate it with data_nil if ($('#edit_synapse_desc').html().trim() == '') { - $('#edit_synapse_desc').html(data_nil); + if (synapse.authorizeToEdit(Metamaps.Active.Mapper)) { + $('#edit_synapse_desc').html(data_nil); + } + else { + $('#edit_synapse_desc').html("(no description)"); + } } $('#edit_synapse_desc').bind("ajax:success", function () { @@ -1334,7 +1394,7 @@ Metamaps.SynapseCard = { }, add_user_info: function (synapse) { var u = '
' + m.get("name") + '
';
+ string += '- ' + '';
});
string += "
-
' + '' + name + '
'
end
diff --git a/app/helpers/synapses_helper.rb b/app/helpers/synapses_helper.rb
index a13a1be2..19286bcd 100644
--- a/app/helpers/synapses_helper.rb
+++ b/app/helpers/synapses_helper.rb
@@ -25,7 +25,7 @@ module SynapsesHelper
synapse['permission'] = s.permission
synapse['mapCount'] = s.maps.count
synapse['originator'] = s.user.name
- synapse['originatorImage'] = s.user.image.url(:square)
+ synapse['originatorImage'] = s.user.image.url(:thirtytwo)
synapse['rtype'] = "synapse"
temp.push synapse
diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb
index 6732f17e..482a663c 100644
--- a/app/helpers/topics_helper.rb
+++ b/app/helpers/topics_helper.rb
@@ -15,9 +15,11 @@ module TopicsHelper
topic['mapCount'] = t.maps.count
topic['synapseCount'] = t.synapses.count
topic['originator'] = t.user.name
- topic['originatorImage'] = t.user.image.url(:square)
+ topic['originatorImage'] = t.user.image.url(:thirtytwo)
topic['rtype'] = "topic"
-
+ topic['inmaps'] = t.inmaps
+ topic['inmapsLinks'] = t.inmapsLinks
+
temp.push topic
end
return temp
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 097ecdfb..5c998b3b 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -8,7 +8,7 @@ module UsersHelper
user['id'] = u.id
user['label'] = u.name
user['value'] = u.name
- user['profile'] = u.image.url(:square)
+ user['profile'] = u.image.url(:sixtyfour)
user['mapCount'] = u.maps.count
user['created_at'] = u.created_at.strftime("%m/%d/%Y")
user['rtype'] = "mapper"
diff --git a/app/models/topic.rb b/app/models/topic.rb
index b19d2d57..4d9cd527 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -54,8 +54,16 @@ class Topic < ActiveRecord::Base
self.synapses.count
end
+ def inmaps
+ self.maps.map(&:name)
+ end
+
+ def inmapsLinks
+ self.maps.map(&:id)
+ end
+
def as_json(options={})
- super(:methods =>[:user_name, :user_image, :map_count, :synapse_count])
+ super(:methods =>[:user_name, :user_image, :map_count, :synapse_count, :inmaps, :inmapsLinks])
end
def topic_autocomplete_method
diff --git a/app/models/user.rb b/app/models/user.rb
index 5d318dff..748602fe 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -32,7 +32,10 @@ class User < ActiveRecord::Base
# This method associates the attribute ":image" with a file attachment
has_attached_file :image, :styles => {
- :square => ['84x84#', :png]
+ :thirtytwo => ['32x32#', :png],
+ :sixtyfour => ['64x64#', :png],
+ :ninetysix => ['96x96#', :png],
+ :onetwentyeight => ['128x128#', :png]
},
:default_url => "/assets/user.png"
@@ -42,7 +45,7 @@ class User < ActiveRecord::Base
def as_json(options={})
{ :id => self.id,
:name => self.name,
- :image => self.image.url(:square)
+ :image => self.image.url(:sixtyfour)
}
end
diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb
index 331cf4e5..600e9fca 100644
--- a/app/views/layouts/_account.html.erb
+++ b/app/views/layouts/_account.html.erb
@@ -4,7 +4,7 @@
#%>
<% account = current_user %>
- <%= image_tag user.image.url(:square), :size => "48x48", :class => "sidebarAccountImage" %>
+ <%= image_tag user.image.url(:sixtyfour), :size => "48x48", :class => "sidebarAccountImage" %>
-
diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb
index 1252034e..952cae1b 100644
--- a/app/views/layouts/_lightboxes.html.erb
+++ b/app/views/layouts/_lightboxes.html.erb
@@ -19,7 +19,7 @@
PRIVATE BETA
2.6 (Catalpa)
-Nov 23, 2014
+Dec 3, 2014
@@ -56,13 +56,13 @@ - - + source code
-
-
+
terms
diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb
index 24c7db6d..8bc56c01 100644
--- a/app/views/layouts/_templates.html.erb
+++ b/app/views/layouts/_templates.html.erb
@@ -35,6 +35,7 @@
Last edited: {{updated_at}}
';
- u += '![]()
'
+ u += ' ![]()
'
u += '
';
$('#editSynLowerBar').append(u);
@@ -3412,38 +3472,67 @@ Metamaps.Filter = {
else console.log(topic);
}
});
+
+ // flag all the edges back to 'untouched'
Metamaps.Synapses.each(function(synapse) {
var e = synapse.get('edge');
- var desc = synapse.get("desc");
+ e.setData('touched', false);
+ });
+ Metamaps.Synapses.each(function(synapse) {
+ var e = synapse.get('edge');
+ var desc;
var user_id = synapse.get("user_id").toString();
- if (visible.synapses.indexOf(desc) == -1) passesSynapse = false;
- else passesSynapse = true;
+ if (e && !e.getData('touched')) {
- if (onMap) {
- // when on a map,
- // we filter by mapper according to the person who added the
- // topic or synapse to the map
- user_id = synapse.getMapping().get("user_id").toString();
- }
- if (visible.mappers.indexOf(user_id) == -1) passesMapper = false;
- else passesMapper = true;
+ var synapses = e.getData('synapses');
- var color = Metamaps.Settings.colors.synapses.normal;
- if (passesSynapse && passesMapper) {
- if (e) {
+ // if any of the synapses represent by the edge are still unfiltered
+ // leave the edge visible
+ passesSynapse = false;
+ for (var i = 0; i < synapses.length; i++) {
+ desc = synapses[i].get("desc");
+ if (visible.synapses.indexOf(desc) > -1) passesSynapse = true;
+ }
+
+ // if the synapse description being displayed is now being
+ // filtered, set the displayIndex to the first unfiltered synapse if there is one
+ var displayIndex = e.getData("displayIndex") ? e.getData("displayIndex") : 0;
+ var displayedSynapse = synapses[displayIndex];
+ desc = displayedSynapse.get("desc");
+ if (passesSynapse && visible.synapses.indexOf(desc) == -1) {
+ // iterate and find an unfiltered one
+ for (var i = 0; i < synapses.length; i++) {
+ desc = synapses[i].get("desc");
+ if (visible.synapses.indexOf(desc) > -1) {
+ e.setData('displayIndex', i);
+ break;
+ }
+ }
+ }
+
+ if (onMap) {
+ // when on a map,
+ // we filter by mapper according to the person who added the
+ // topic or synapse to the map
+ user_id = synapse.getMapping().get("user_id").toString();
+ }
+ if (visible.mappers.indexOf(user_id) == -1) passesMapper = false;
+ else passesMapper = true;
+
+ var color = Metamaps.Settings.colors.synapses.normal;
+ if (passesSynapse && passesMapper) {
e.setData('alpha', 1, 'end');
e.setData('color', color, 'end');
}
- else console.log(synapse);
- }
- else {
- if (e) {
+ else {
Metamaps.Control.deselectEdge(e, true);
e.setData('alpha', opacityForFilter, 'end');
}
- else console.log(synapse);
+
+ e.setData('touched', true);
}
+ else if (!e) console.log(synapse);
});
// run the animation
@@ -3493,7 +3582,9 @@ Metamaps.Listeners = {
case 69: //if e or E is pressed
if (e.ctrlKey){
e.preventDefault();
- Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
+ if (Metamaps.Active.Map) {
+ Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
+ }
}
break;
case 77: //if m or M is pressed
@@ -3931,6 +4022,9 @@ Metamaps.Topic = {
return;
}
+ // hide the 'double-click to add a topic' message
+ Metamaps.Famous.viz.hideInstructions();
+
$(document).trigger(Metamaps.Map.events.editedByActiveMapper);
var metacode = Metamaps.Metacodes.get(Metamaps.Create.newTopic.metacode);
@@ -4479,7 +4573,6 @@ Metamaps.Map = {
encoded_image: canvas.canvas.toDataURL()
};
- console.log(imageData.encoded_image);
var map = Metamaps.Active.Map;
var today = new Date();
@@ -4538,13 +4631,13 @@ Metamaps.Map.CheatSheet = {
};
$('#gettingStarted').click(function() {
- switchVideo(this,'88334167');
+ //switchVideo(this,'88334167');
});
$('#upYourSkillz').click(function() {
- switchVideo(this,'100118167');
+ //switchVideo(this,'100118167');
});
$('#advancedMapping').click(function() {
- switchVideo(this,'88334167');
+ //switchVideo(this,'88334167');
});
}
}; // end Metamaps.Map.CheatSheet
@@ -4687,6 +4780,8 @@ Metamaps.Map.InfoBox = {
$('.mapContributors .tip').unbind().click(function(event){
event.stopPropagation();
});
+ $('.mapContributors .tip li a').click(Metamaps.Router.intercept);
+
$('.mapInfoBox').unbind('.hideTip').bind('click.hideTip', function(){
$('.mapContributors .tip').hide();
});
@@ -4700,15 +4795,15 @@ Metamaps.Map.InfoBox = {
var self = Metamaps.Map.InfoBox;
var string = "";
-
+ console.log("hello!!")
string += "' + synapse.get("user_name") + '
- ";
Metamaps.Mappers.each(function(m){
- string += '