From a382e0c35d2e40f40e27889b1863e9bc1eecd2e5 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 1 Oct 2014 14:07:48 -0400 Subject: [PATCH] account page image border radius, fixed filters not working on first click issue --- app/assets/javascripts/src/Metamaps.js | 17 ----------------- app/assets/stylesheets/application.css | 3 +++ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 83128629..1cbb6f06 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -2507,21 +2507,6 @@ Metamaps.Filter = { $('#filter_by_mapper ul').empty(); $('#filter_by_synapse ul').empty(); }, - initializeFilterData: function () { - var self = Metamaps.Filter; - - var check = function (filtersToUse, topicsOrSynapses, propertyToCheck) { - Metamaps[topicsOrSynapses].each(function(model) { - var prop = model.get(propertyToCheck) ? model.get(propertyToCheck).toString() : false; - if (prop && self.visible[filtersToUse].indexOf(prop) === -1) { - self.visible[filtersToUse].push(prop); - } - }); - }; - check('metacodes', 'Topics', 'metacode_id'); - check('mappers', 'Mappings', 'user_id'); - check('synapses', 'Synapses', 'desc'); - }, /* Most of this data essentially depends on the ruby function which are happening for filter inside view filterBox But what these function do is load this data into three accessible array within java : metacodes, mappers and synapses @@ -2969,7 +2954,6 @@ Metamaps.Topic = { // update filters Metamaps.Filter.reset(); - Metamaps.Filter.initializeFilterData(); // this sets all the visible filters to true // these three update the actual filter box with the right list items Metamaps.Filter.checkMetacodes(); @@ -3356,7 +3340,6 @@ Metamaps.Map = { // update filters Metamaps.Filter.reset(); - Metamaps.Filter.initializeFilterData(); // this sets all the visible filters to true // set the proper mapinfobox content Metamaps.Map.InfoBox.load(); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index fae1d428..c4fc66b5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -127,6 +127,9 @@ body, position: relative; margin-top: 32px; } +.edit_user .userImage img { + border-radius: 42px; +} .edit_user .editPhoto { display: none; width: 40px;