Unverified Commit b77ecd48 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Replace aspect_membership_dropdown with aspect-membership-dropdown

parent 473cc251

app/assets/javascripts/app/helpers/handlebars-helpers.js

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ Handlebars.registerHelper("isCurrentProfilePage", function(id, diasporaHandle, o 
});



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-";

  if( in_aspect === 'in_aspect' ) {

app/assets/javascripts/app/pages/getting_started.js

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ app.pages.GettingStarted = app.views.Base.extend({ 
  templateName: false,



  subviews: {

    ".aspect_membership_dropdown": "aspectMembershipView"

    ".aspect-membership-dropdown": "aspectMembershipView"

  },



  initialize: function(opts) {

app/assets/javascripts/app/router.js

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ app.Router = Backbone.Router.extend({ 
  },



  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 view = new app.views.AspectMembership({person: app.contacts.findWhere({"person_id": personId}).person});

      $(this).html(view.render().$el);

app/assets/javascripts/app/views/aspect_membership_view.js

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */

app.views.AspectMembership = app.views.Base.extend({

  templateName: "aspect_membership_dropdown",

  className: "btn-group aspect-dropdown aspect_membership_dropdown",

  className: "btn-group aspect-dropdown aspect-membership-dropdown",



  subviews: {

    ".newAspectContainer": "aspectCreateView"
@@ -124,7 +124,7 @@ app.views.AspectMembership = app.views.Base.extend({ 
  // show an error flash msg

  _displayError: function(model, resp) {

    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/assets/javascripts/app/views/contact_view.js

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ app.views.Contact = app.views.Base.extend({ 
  templateName: 'contact',



  subviews: {

    ".aspect_membership_dropdown": "AspectMembershipView"

    ".aspect-membership-dropdown": "AspectMembershipView"

  },



  events: {