From a132b6c1b5c6834fea50a8d5f70e29104a7ec868 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 9 Dec 2013 20:31:39 +1100 Subject: [PATCH] refactored a bit in help section views. using backbone jquery selector shorthand and jquery each. --- .../app/views/faq_question_view.js | 5 ++--- .../app/views/help_section_view.js | 8 ++++---- app/assets/javascripts/app/views/help_view.js | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/app/views/faq_question_view.js b/app/assets/javascripts/app/views/faq_question_view.js index 28f68088d..b5654c549 100644 --- a/app/assets/javascripts/app/views/faq_question_view.js +++ b/app/assets/javascripts/app/views/faq_question_view.js @@ -19,9 +19,8 @@ app.views.FaqQuestionView = app.views.Base.extend({ var section = app.views.Base.prototype.render.apply(this, arguments); // After render actions - var el = $(this.el); - el.find('.question.collapsible').removeClass('opened').addClass('collapsed'); - el.find('.answer').hide(); + this.$('.question.collapsible').removeClass('opened').addClass('collapsed'); + this.$('.answer').hide(); return section; }, diff --git a/app/assets/javascripts/app/views/help_section_view.js b/app/assets/javascripts/app/views/help_section_view.js index 2860cce4a..07260af54 100644 --- a/app/assets/javascripts/app/views/help_section_view.js +++ b/app/assets/javascripts/app/views/help_section_view.js @@ -15,10 +15,10 @@ app.views.HelpSectionView = app.views.StaticContentView.extend({ var section = app.views.Base.prototype.render.apply(this, arguments); // After render actions - $(this.el).find('.question.collapsible').removeClass('opened').addClass('collapsed'); - $(this.el).find('.answer.hideable').hide(); - $(this.el).find('.question.collapsible :first').addClass('opened').removeClass('collapsed'); - $(this.el).find('.answer.hideable :first').show(); + this.$('.question.collapsible').removeClass('opened').addClass('collapsed'); + this.$('.answer.hideable').hide(); + this.$('.question.collapsible :first').addClass('opened').removeClass('collapsed'); + this.$('.answer.hideable :first').show(); return section; }, diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js index f86e9bab7..8cf8fac08 100644 --- a/app/assets/javascripts/app/views/help_view.js +++ b/app/assets/javascripts/app/views/help_view.js @@ -59,16 +59,17 @@ app.views.Help = app.views.StaticContentView.extend({ this.clearItems(); var section = el.data('section'); var items = el.data('items').split(" "); + var self = this; - items.forEach(function(item, i){ + $.each(items, function(i, item){ var qa = { className: "faq_question_" + section, - question: this.getText(section, item, true), - answer: this.getText(section, item, false) + question: self.getText(section, item, true), + answer: self.getText(section, item, false) }; item = new app.views.FaqQuestionView(qa); - this.$el.find('#faq').append(item.render().el); - }, this); + self.$('#faq').append(item.render().el); + }); this.setInitialVisibility(); }, @@ -79,8 +80,8 @@ app.views.Help = app.views.StaticContentView.extend({ }, setInitialVisibility: function() { - this.$el.find('#faq .question.collapsible :first').addClass('opened').removeClass('collapsed'); - this.$el.find('#faq .question.collapsible .answer :first').show(); + this.$('#faq .question.collapsible :first').addClass('opened').removeClass('collapsed'); + this.$('#faq .question.collapsible .answer :first').show(); }, resetMenu: function(initial) { @@ -99,7 +100,7 @@ app.views.Help = app.views.StaticContentView.extend({ }, clearItems: function() { - this.$el.find('#faq').empty(); + this.$('#faq').empty(); }, sectionClicked : function(e) { @@ -113,7 +114,7 @@ app.views.Help = app.views.StaticContentView.extend({ this.clearItems(); data = $.extend(Diaspora.I18n.locale[section], { className: section }); help_section = new app.views.HelpSectionView( template, data, subs ); - this.$el.find('#faq').append(help_section.render().el); + this.$('#faq').append(help_section.render().el); }, gettingHelp: function(e) {