nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace aspect_membership_dropdown with aspect-membership-dropdown

Browse source
This commit is contained in:
Steffen van Bergerem 2017-08-30 12:29:03 +02:00 committed by Benjamin Neff
parent 473cc2518b
commit b77ecd482a
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
18 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/helpers/handlebars-helpers.js
View file

@ -116,7 +116,7 @@ Handlebars.registerHelper("isCurrentProfilePage", function(id, diasporaHandle, o
}); });
Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) { Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) {
if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect_membership_dropdown placeholder"></div>'; if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect-membership-dropdown placeholder"></div>';
var html = "<i class=\"entypo-"; var html = "<i class=\"entypo-";
if( in_aspect === 'in_aspect' ) { if( in_aspect === 'in_aspect' ) {

2
app/assets/javascripts/app/pages/getting_started.js
View file

@ -5,7 +5,7 @@ app.pages.GettingStarted = app.views.Base.extend({
templateName: false, templateName: false,
subviews: { subviews: {
".aspect_membership_dropdown": "aspectMembershipView" ".aspect-membership-dropdown": "aspectMembershipView"
}, },
initialize: function(opts) { initialize: function(opts) {

2
app/assets/javascripts/app/router.js
View file

@ -229,7 +229,7 @@ app.Router = Backbone.Router.extend({
}, },
renderAspectMembershipDropdowns: function($context) { renderAspectMembershipDropdowns: function($context) {
$context.find(".aspect_membership_dropdown.placeholder").each(function() { $context.find(".aspect-membership-dropdown.placeholder").each(function() {
var personId = $(this).data("personId"); var personId = $(this).data("personId");
var view = new app.views.AspectMembership({person: app.contacts.findWhere({"person_id": personId}).person}); var view = new app.views.AspectMembership({person: app.contacts.findWhere({"person_id": personId}).person});
$(this).html(view.render().$el); $(this).html(view.render().$el);

4
app/assets/javascripts/app/views/aspect_membership_view.js
View file

@ -9,7 +9,7 @@
*/ */
app.views.AspectMembership = app.views.Base.extend({ app.views.AspectMembership = app.views.Base.extend({
templateName: "aspect_membership_dropdown", templateName: "aspect_membership_dropdown",
className: "btn-group aspect-dropdown aspect_membership_dropdown", className: "btn-group aspect-dropdown aspect-membership-dropdown",
subviews: { subviews: {
".newAspectContainer": "aspectCreateView" ".newAspectContainer": "aspectCreateView"
@ -124,7 +124,7 @@ app.views.AspectMembership = app.views.Base.extend({
// show an error flash msg // show an error flash msg
_displayError: function(model, resp) { _displayError: function(model, resp) {
this._done(); this._done();
this.dropdown.closest(".aspect_membership_dropdown").removeClass("open"); // close the dropdown this.dropdown.closest(".aspect-membership-dropdown").removeClass("open"); // close the dropdown
app.flashMessages.handleAjaxError(resp); app.flashMessages.handleAjaxError(resp);
}, },

2
app/assets/javascripts/app/views/contact_view.js
View file

@ -4,7 +4,7 @@ app.views.Contact = app.views.Base.extend({
templateName: 'contact', templateName: 'contact',
subviews: { subviews: {
".aspect_membership_dropdown": "AspectMembershipView" ".aspect-membership-dropdown": "AspectMembershipView"
}, },
events: { events: {

2
app/assets/javascripts/app/views/profile_header_view.js
View file

@ -4,7 +4,7 @@ app.views.ProfileHeader = app.views.Base.extend({
templateName: 'profile_header', templateName: 'profile_header',
subviews: { subviews: {
".aspect_membership_dropdown": "aspectMembershipView" ".aspect-membership-dropdown": "aspectMembershipView"
}, },
events: { events: {

2
app/assets/javascripts/contact-list.js
View file

@ -18,7 +18,7 @@ var List = {
if (data.contacts) { if (data.contacts) {
var contacts = new app.collections.Contacts(data.contacts); var contacts = new app.collections.Contacts(data.contacts);
$(".aspect_membership_dropdown.placeholder").each(function() { $(".aspect-membership-dropdown.placeholder").each(function() {
var personId = $(this).data("personId"); var personId = $(this).data("personId");
var view = new app.views.AspectMembership({person: contacts.findWhere({"person_id": personId}).person}); var view = new app.views.AspectMembership({person: contacts.findWhere({"person_id": personId}).person});
$(this).html(view.render().$el); $(this).html(view.render().$el);

2
app/assets/stylesheets/header.scss
View file

@ -94,7 +94,7 @@
margin-right: 10px; margin-right: 10px;
opacity: 1; opacity: 1;
} }
& > .pull-right > .aspect_membership_dropdown { display: none; } & > .pull-right > .aspect-membership-dropdown { display: none; }
} }
.ajax-loader { .ajax-loader {
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;

2
app/assets/stylesheets/hovercard.scss
View file

@ -65,7 +65,7 @@
margin-bottom: 5px; margin-bottom: 5px;
} }
.btn-group.aspect_membership_dropdown { margin: 0 !important; } .btn-group.aspect-membership-dropdown { margin: 0 !important; }
} }
#hovercard_container { #hovercard_container {

2
app/assets/stylesheets/notifications.scss
View file

@ -96,6 +96,6 @@
opacity: 0; opacity: 0;
} }
.btn-group.aspect_membership_dropdown { margin: 5px 0; } .btn-group.aspect-membership-dropdown { margin: 5px 0; }
} }
} }

2
app/assets/stylesheets/people.scss
View file

@ -20,7 +20,7 @@
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.btn-group.aspect_membership_dropdown { margin: 12px 0; } .btn-group.aspect-membership-dropdown { margin: 12px 0; }
.thats_you { .thats_you {
line-height: 50px; line-height: 50px;
margin-right: 10px; margin-right: 10px;

2
app/assets/templates/profile_header_tpl.jst.hbs
View file

@ -33,7 +33,7 @@
{{else}} {{#if is_blocked}} {{else}} {{#if is_blocked}}
<a href="#" id="unblock_user_button" class="btn btn-danger">{{t 'people.stop_ignoring'}}</a> <a href="#" id="unblock_user_button" class="btn btn-danger">{{t 'people.stop_ignoring'}}</a>
{{else}} {{else}}
<div class="placeholder aspect_membership_dropdown"></div> <div class="placeholder aspect-membership-dropdown"></div>
{{/if}}{{/if}} {{/if}}{{/if}}
</div> </div>
{{/if}} {{/if}}

2
app/views/aspect_memberships/_aspect_membership_dropdown.haml
View file

@ -1 +1 @@
.placeholder.aspect_membership_dropdown .placeholder.aspect-membership-dropdown

2
app/views/notifications/_notification.haml
View file

@ -6,7 +6,7 @@
- if note.target.present? - if note.target.present?
- gon_load_contact(note.contact) - gon_load_contact(note.contact)
.pull-right .pull-right
.aspect_membership_dropdown.placeholder{data: {person_id: note.target.id}} .aspect-membership-dropdown.placeholder{data: {person_id: note.target.id}}
.media-object.pull-left .media-object.pull-left
= person_image_link note.actors.first, :size => :thumb_small, :class => 'hovercardable' = person_image_link note.actors.first, :size => :thumb_small, :class => 'hovercardable'

2
app/views/people/_relationship_action.haml
View file

@ -1,5 +1,5 @@
- unless person == current_user.person - unless person == current_user.person
.aspect_membership_dropdown.placeholder{data: {person_id: person.id}} .aspect-membership-dropdown.placeholder{data: {person_id: person.id}}
-else -else
%span.thats_you %span.thats_you
= t("people.person.thats_you") = t("people.person.thats_you")

2
features/desktop/connects_users.feature
View file

@ -30,7 +30,7 @@ Feature: following and being followed
When I sign in as "alice@alice.alice" When I sign in as "alice@alice.alice"
And I am on "bob@bob.bob"'s page And I am on "bob@bob.bob"'s page
And I press the first ".aspect_membership_dropdown .dropdown-toggle" And I press the first ".aspect-membership-dropdown .dropdown-toggle"
And I press the first "a" within ".add_aspect" And I press the first "a" within ".add_aspect"
And I fill in "aspect_name" with "Super People" in the aspect creation modal And I fill in "aspect_name" with "Super People" in the aspect creation modal

10
features/step_definitions/aspects_steps.rb
View file

@ -15,13 +15,13 @@ module AspectCukeHelpers
end end
def toggle_aspect_via_ui(aspect_name) def toggle_aspect_via_ui(aspect_name)
aspects_dropdown = find(".aspect_membership_dropdown .dropdown-toggle", match: :first) aspects_dropdown = find(".aspect-membership-dropdown .dropdown-toggle", match: :first)
aspects_dropdown.trigger "click" aspects_dropdown.trigger "click"
selected_aspect_count = all(".aspect_membership_dropdown.open .dropdown-menu li.selected").length selected_aspect_count = all(".aspect-membership-dropdown.open .dropdown-menu li.selected").length
aspect = find(".aspect_membership_dropdown.open .dropdown-menu li", text: aspect_name) aspect = find(".aspect-membership-dropdown.open .dropdown-menu li", text: aspect_name)
aspect_selected = aspect["class"].include? "selected" aspect_selected = aspect["class"].include? "selected"
aspect.trigger "click" aspect.trigger "click"
expect(find(".aspect_membership_dropdown .dropdown-menu", visible: false)).to have_no_css(".loading") expect(find(".aspect-membership-dropdown .dropdown-menu", visible: false)).to have_no_css(".loading")
# close dropdown # close dropdown
page.should have_no_css('#profile.loading') page.should have_no_css('#profile.loading')
@ -31,7 +31,7 @@ module AspectCukeHelpers
end end
def aspect_dropdown_visible? def aspect_dropdown_visible?
expect(find('.aspect_membership_dropdown.open')).to be_visible expect(find('.aspect-membership-dropdown.open')).to be_visible
end end
end end
World(AspectCukeHelpers) World(AspectCukeHelpers)

2
spec/controllers/notifications_controller_spec.rb
View file

@ -119,7 +119,7 @@ describe NotificationsController, :type => :controller do
eve.share_with(alice.person, eve.aspects.first) eve.share_with(alice.person, eve.aspects.first)
get :index, params: {per_page: 5} get :index, params: {per_page: 5}
expect(Nokogiri(response.body).css(".aspect_membership_dropdown")).not_to be_empty expect(Nokogiri(response.body).css(".aspect-membership-dropdown")).not_to be_empty
end end
it 'succeeds on mobile' do it 'succeeds on mobile' do