Merge branch 'feature/rocky/discussion' into feature/rocky/loading

lms/static/coffee/src/discussion/content.coffee

@@ -365,9 +365,6 @@ if Backbone?
     initTimeago: ->
       @$("span.timeago").timeago()
 
-    initPermalink: ->
-      @$(".discussion-permanent-link").attr "href", @model.permalink()
-
     renderPartial: ->
       for attr, value of @model.changedAttributes()
         if @partial[attr]
@@ -402,10 +399,6 @@ if Backbone?
       @set('thread', @)
       super()
 
-    permalink: ->
-      discussion_id = @get('commentable_id')
-      return Discussion.urlFor("permanent_link_thread", discussion_id, @id)
-
   class @ThreadView extends @ContentView
 
   class @Comment extends @Content
@@ -418,11 +411,6 @@ if Backbone?
       'update': -> DiscussionUtil.urlFor('update_comment', @id)
       'delete': -> DiscussionUtil.urlFor('delete_comment', @id)
 
-    permalink: ->
-      thread_id = @get('thread').id
-      discussion_id = @get('thread').get('commentable_id')
-      return Discussion.urlFor("permanent_link_comment", discussion_id, thread_id, @id)
-
     getCommentsCount: ->
       count = 0
       @get('comments').each (comment) ->

lms/static/coffee/src/discussion/discussion_module.coffee

@@ -16,7 +16,7 @@ if Backbone?
           $elem = $(event.target)
           discussion_id = $elem.attr("discussion_id")
           url = DiscussionUtil.urlFor 'retrieve_discussion', discussion_id
-          Discussion.safeAjax
+          DiscussionUtil.safeAjax
             $elem: $elem
             url: url
             type: "GET"

lms/templates/courseware/courseware.html

@@ -22,6 +22,7 @@
   ##  <script type="text/javascript" src="${static.url('js/vendor/CodeMirror-2.25/mode/python/python.js')}"></script>
 
   <%static:js group='courseware'/>
+  <%static:js group='discussion'/>
 
   <%include file="../discussion/_js_body_dependencies.html" />