Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms

common/lib/xmodule/xmodule/x_module.py

@@ -196,6 +196,11 @@ class XModule(object):
         return ""
 
     # ================================== HTML INTERFACE DEFINITIONS ======================
+
+    @property
+    def js_module_name(self):
+        return self.__class__.__name__
+
     @classmethod
     def get_javascript(cls):
         """
@@ -401,6 +406,10 @@ class XModuleDescriptor(Plugin):
         raise NotImplementedError('Modules must implement export_to_xml to enable xml export')
 
     # ================================== HTML INTERFACE DEFINITIONS ======================
+    @property
+    def js_module_name(self):
+        return self.__class__.__name__
+
     @classmethod
     def get_javascript(cls):
         """