Included PublishEventMixin

google_drive/google_calendar.py

@@ -11,10 +11,11 @@ from xblock.fields import Scope, String, Integer
 from xblock.fragment import Fragment
 
 from .utils import loader, AttrDict
+from xblockutils.publish_event import PublishEventMixin
 
 # Classes ###########################################################
 
-class GoogleCalendarBlock(XBlock):
+class GoogleCalendarBlock(XBlock, PublishEventMixin):
     """
     XBlock providing a google calendar view for a specific calendar
     """
@@ -92,16 +93,6 @@ class GoogleCalendarBlock(XBlock):
             'result': 'success',
         }
 
-    @XBlock.json_handler
-    def publish_event(self, calendar_data, suffix=''):
-
-        event_name = calendar_data.pop('event_name')
-        self.runtime.publish(self, event_name, calendar_data)
-
-        return {
-            'result': 'success',
-        }
-
     @staticmethod
     def workbench_scenarios():
         """

google_drive/google_docs.py

@@ -12,10 +12,11 @@ from xblock.fields import Scope, String
 from xblock.fragment import Fragment
 
 from .utils import loader, AttrDict
+from xblockutils.publish_event import PublishEventMixin
 
 # Classes ###########################################################
 
-class GoogleDocumentBlock(XBlock):
+class GoogleDocumentBlock(XBlock, PublishEventMixin):
     """
     XBlock providing a google document embed link
     """
@@ -86,16 +87,6 @@ class GoogleDocumentBlock(XBlock):
         }
 
     @XBlock.json_handler
-    def publish_event(self, data, suffix=''):
-
-        event_name = data.pop('event_name')
-        self.runtime.publish(self, event_name, data)
-
-        return {
-            'result': 'success',
-        }
-
-    @XBlock.json_handler
     def check_url(self, data, suffix=''):
 
         try:

google_drive/public/js/google_calendar.js

@@ -6,7 +6,7 @@ function GoogleCalendarBlock(runtime, element) {
         $.ajax({
             type: "POST",
             url: runtime.handlerUrl(element, 'publish_event'),
-            data: JSON.stringify({url: iframe_url, displayedin: 'iframe', event_name: 'edx.googlecomponent.calendar.displayed'})
+            data: JSON.stringify({url: iframe_url, displayedin: 'iframe', event_type: 'edx.googlecomponent.calendar.displayed'})
         });
     });
 }

google_drive/public/js/google_docs.js

@@ -20,7 +20,7 @@ function GoogleDocumentBlock(runtime, element) {
             data: JSON.stringify({
                 url: document_url,
                 displayedin: presented_within,
-                event_name: 'edx.googlecomponent.document.displayed',
+                event_type: 'edx.googlecomponent.document.displayed',
              })
         });
     }

google_drive/utils.py

@@ -9,7 +9,7 @@ import pkg_resources
 from django.template import Context, Template
 
 from xblockutils.resources import ResourceLoader
-
+from xblockutils.publish_event import PublishEventMixin
 
 # Globals ###########################################################