From 2900c169cc01f06e8ebc4fc14ca045a74ba528ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= Date: Tue, 11 Sep 2012 15:58:16 -0400 Subject: [PATCH] Load inline comments templates at render time and not during page load --- .../src/discussion/views/discussion_thread_edit_view.coffee | 3 +-- .../discussion/views/discussion_thread_inline_view.coffee | 6 +++--- .../src/discussion/views/discussion_thread_show_view.coffee | 3 +-- .../src/discussion/views/discussion_thread_view.coffee | 3 +-- .../src/discussion/views/response_comment_view.coffee | 4 +++- .../coffee/src/discussion/views/thread_response_view.coffee | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_edit_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_edit_view.coffee index f6dc2c39bc..18c1701e50 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_edit_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_edit_view.coffee @@ -4,8 +4,6 @@ class @DiscussionThreadEditView extends Backbone.View "click .post-update": "update" "click .post-cancel": "cancel_edit" - template: _.template($("#thread-edit-template").html()) - $: (selector) -> @$el.find(selector) @@ -13,6 +11,7 @@ class @DiscussionThreadEditView extends Backbone.View super() render: -> + @template = _.template($("#thread-edit-template").html()) @$el.html(@template(@model.toJSON())) @delegateEvents() DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "edit-post-body" diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee index 7060da43c2..c6847cc6fb 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_inline_view.coffee @@ -11,8 +11,6 @@ if Backbone? "click .expand-post": "expandPost" "click .collapse-post": "collapsePost" - template: -> DiscussionUtil.getTemplate("_inline_thread") - initLocal: -> @$local = @$el.children(".discussion-article").children(".local") @$delegateElement = @$local @@ -22,12 +20,14 @@ if Backbone? @model.on "change", @updateModelDetails render: -> + @template = DiscussionUtil.getTemplate("_inline_thread") + if not @model.has('abbreviatedBody') @abbreviateBody() params = $.extend(@model.toJSON(),{expanded: @expanded}) if not @model.get('anonymous') params = $.extend(params, user:{username: @model.username, user_url: @model.user_url}) - @$el.html(Mustache.render(@template(), params)) + @$el.html(Mustache.render(@template, params)) @initLocal() @delegateEvents() @renderDogear() diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee index 61bb3c29d7..7a5936a8f7 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee @@ -7,8 +7,6 @@ class @DiscussionThreadShowView extends DiscussionContentView "click .action-delete": "delete" "click .action-openclose": "toggleClosed" - template: _.template($("#thread-show-template").html()) - $: (selector) -> @$el.find(selector) @@ -17,6 +15,7 @@ class @DiscussionThreadShowView extends DiscussionContentView @model.on "change", @updateModelDetails render: -> + @template = _.template($("#thread-show-template").html()) @$el.html(@template(@model.toJSON())) @delegateEvents() @renderDogear() diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee index 2b3630e7df..f56a47b85d 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -4,8 +4,6 @@ if Backbone? events: "click .discussion-submit-post": "submitComment" - template: _.template($("#thread-template").html()) - $: (selector) -> @$el.find(selector) @@ -14,6 +12,7 @@ if Backbone? @createShowView() render: -> + @template = _.template($("#thread-template").html()) @$el.html(@template(@model.toJSON())) @delegateEvents() diff --git a/lms/static/coffee/src/discussion/views/response_comment_view.coffee b/lms/static/coffee/src/discussion/views/response_comment_view.coffee index e797dd0d4d..03c0dbdc9f 100644 --- a/lms/static/coffee/src/discussion/views/response_comment_view.coffee +++ b/lms/static/coffee/src/discussion/views/response_comment_view.coffee @@ -1,13 +1,14 @@ if Backbone? class @ResponseCommentView extends DiscussionContentView tagName: "li" - template: _.template($("#response-comment-template").html()) + initLocal: -> # TODO .response-local is the parent of the comments so @$local is null, not sure what was intended here... @$local = @$el.find(".response-local") @$delegateElement = @$local render: -> + @template = _.template($("#response-comment-template").html()) params = @model.toJSON() params['deep'] = @options.deep if @options.deep @@ -20,6 +21,7 @@ if Backbone? @$el.find(".timeago").timeago() @convertMath() @ + convertMath: -> body = @$el.find(".response-body") body.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight body.html() diff --git a/lms/static/coffee/src/discussion/views/thread_response_view.coffee b/lms/static/coffee/src/discussion/views/thread_response_view.coffee index 0dcd34a9f0..00aad39620 100644 --- a/lms/static/coffee/src/discussion/views/thread_response_view.coffee +++ b/lms/static/coffee/src/discussion/views/thread_response_view.coffee @@ -4,7 +4,6 @@ if Backbone? console.log('test 2') class @ThreadResponseView extends DiscussionContentView tagName: "li" - template: _.template($("#thread-response-template").html()) events: "click .vote-btn": "toggleVote" @@ -13,6 +12,7 @@ if Backbone? "click .action-delete": "delete" render: -> + @template = _.template($("#thread-response-template").html()) @$el.html(@template(@model.toJSON())) @initLocal() @delegateEvents()