Update annotations modules to use the course_id from the runtime, rather than…

Update annotations modules to use the course_id from the runtime, rather than extracting it from the page

common/lib/xmodule/xmodule/textannotation_module.py

@@ -81,6 +81,7 @@ class TextAnnotationModule(AnnotatableFields, XModule):
     def get_html(self):
         """ Renders parameters to template. """
         context = {
+            'course_id': self.runtime.course_id,
             'display_name': self.display_name_with_default,
             'tag': self.tags,
             'source': self.source,

common/lib/xmodule/xmodule/videoannotation_module.py

@@ -149,6 +149,7 @@ class VideoAnnotationModule(AnnotatableFields, XModule):
         extension = self._get_extension(self.sourceurl)
 
         context = {
+            'course_id': self.runtime.course_id,
             'display_name': self.display_name_with_default,
             'instructions_html': self.instructions,
             'sourceUrl': self.sourceurl,

lms/templates/textannotation.html

@@ -47,13 +47,10 @@
 	//Grab uri of the course
     var parts = window.location.href.split("/"),
     	uri = '',
-	courseid;
 	for (var index = 0; index <= 9; index += 1) uri += parts[index]+"/"; //Get the unit url
-	courseid = parts[4] + "/" + parts[5] + "/" + parts[6];
 	//Change uri in cms
 	var lms_location = $('.sidebar .preview-button').attr('href');
 	if (typeof lms_location!='undefined'){
-		courseid = parts[4].split(".").join("/");
 		uri = window.location.protocol;
 		for (var index = 0; index <= 9; index += 1) uri += lms_location.split("/")[index]+"/"; //Get the unit url
 	}
@@ -115,7 +112,7 @@
                   },
             },
             auth: {
-                tokenUrl: location.protocol+'//'+location.host+"/token?course_id="+courseid
+                tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course_id.to_deprecated_string()}"
             },
             store: {
                 // The endpoint of the store on your server.

lms/templates/videoannotation.html

@@ -50,13 +50,10 @@
 	//Grab uri of the course
     var parts = window.location.href.split("/"),
     	uri = '',
-	courseid;
 	for (var index = 0; index <= 9; index += 1) uri += parts[index]+"/"; //Get the unit url
-	courseid = parts[4] + "/" + parts[5] + "/" + parts[6];
 	//Change uri in cms
 	var lms_location = $('.sidebar .preview-button').attr('href');
 	if (typeof lms_location!='undefined'){
-		courseid = parts[4].split(".").join("/");
 		uri = window.location.protocol;
 		for (var index = 0; index <= 9; index += 1) uri += lms_location.split("/")[index]+"/"; //Get the unit url
 	}
@@ -119,7 +116,7 @@
                   },
             },
             auth: {
-                tokenUrl: location.protocol+'//'+location.host+"/token?course_id="+courseid
+                tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course_id.to_deprecated_string()}"
             },
             store: {
                 // The endpoint of the store on your server.