Switched package prefix to realtime.store and use onXXX for event reg…

…ister
Code24World · Jul 11, 2014 · 65b30f5 · 65b30f5
1 parent 9fe2170
commit 65b30f5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 23 deletions.
diff --git a/app/js/rtpg.collaborators.js b/app/js/rtpg.collaborators.js
@@ -51,8 +51,8 @@ rtpg.collaborators.connectUi = function() {
 
 rtpg.collaborators.connectRealtime = function(doc) {
  //Adding Listeners for Collaborator events.
- doc.addEventListener(gapi.drive.realtime.EventType.COLLABORATOR_JOINED, rtpg.collaborators.onCollaboratorJoined);
- doc.addEventListener(gapi.drive.realtime.EventType.COLLABORATOR_LEFT, rtpg.collaborators.onCollaboratorLeft);
+ doc.onCollaboratorJoined(rtpg.collaborators.onCollaboratorJoined);
+ doc.onCollaboratorLeft(rtpg.collaborators.onCollaboratorLeft);
  rtpg.collaborators.updateUi();
 };
 

diff --git a/app/js/rtpg.custom.js b/app/js/rtpg.custom.js
@@ -82,7 +82,7 @@ rtpg.custom.initializeModel = function(model) {
 
 rtpg.custom.registerTypes = function() {
  var Movie = rtpg.custom.Movie;
- var custom = gapi.drive.realtime.custom;
+ var custom = realtime.store.custom;
  custom.registerType(Movie, 'DemoMovie');
  Movie.prototype.name = custom.collaborativeField('name');
  Movie.prototype.director = custom.collaborativeField('director');
@@ -134,6 +134,6 @@ rtpg.custom.connectUi = function() {
 
 rtpg.custom.connectRealtime = function() {
  if(rtpg.custom.field){
- rtpg.custom.field.addEventListener(gapi.drive.realtime.EventType.VALUE_CHANGED, rtpg.custom.onRealtimeChange); 
+ rtpg.custom.field.onValueChanged(rtpg.custom.onRealtimeChange);
  }
 };
diff --git a/app/js/rtpg.js b/app/js/rtpg.js
@@ -108,7 +108,7 @@ rtpg.onFileLoaded = function(doc) {
  $('#undoButton').prop('disabled', !e.canUndo);
  $('#redoButton').prop('disabled', !e.canRedo);
  };
- model.addEventListener(gapi.drive.realtime.EventType.UNDO_REDO_STATE_CHANGED, onUndoRedoStateChanged);
+ model.onUndoRedoStateChanged(onUndoRedoStateChanged);
 
  // We load the name of the file to populate the file name field.
  gapi.client.load('drive', 'v2', function() {

diff --git a/app/js/rtpg.list.js b/app/js/rtpg.list.js
@@ -75,8 +75,7 @@ rtpg.list.garbageCollectCursorMap = function () {
  rtpg.list.cursors.delete(keys[i]);
  } else {
  // Create listeners for collaborators that already existed when the document opened
- rtpg.list.cursors.get(keys[i])
- .addEventListener(gapi.drive.realtime.EventType.REFERENCE_SHIFTED, rtpg.list.onRealtimeReferenceShifted);
+ rtpg.list.cursors.get(keys[i]).onReferenceShifted(rtpg.list.onRealtimeReferenceShifted);
  }
  }
 };
@@ -109,8 +108,7 @@ rtpg.list.onListItemClick = function (evt) {
  // Register Reference
  if(!rtpg.list.field.registeredReference){
  rtpg.list.field.registeredReference = rtpg.list.field.registerReference(index, true);
- rtpg.list.field.registeredReference
- .addEventListener(gapi.drive.realtime.EventType.REFERENCE_SHIFTED, rtpg.list.onRealtimeReferenceShifted);
+ rtpg.list.field.registeredReference.onReferenceShifted(rtpg.list.onRealtimeReferenceShifted);
  if(rtpg.list.cursors){
  rtpg.list.cursors.set(rtpg.getMe().sessionId, rtpg.list.field.registeredReference);
  }
@@ -216,7 +214,7 @@ rtpg.list.onRealtimeReferenceShifted = function (evt) {
 
 rtpg.list.onRealtimeCursorChange = function (evt) {
  console.log('Cursor Change Event');
- evt.newValue.addEventListener(gapi.drive.realtime.EventType.REFERENCE_SHIFTED, rtpg.list.onRealtimeReferenceShifted);
+ evt.newValue.onReferenceShifted(rtpg.list.onRealtimeReferenceShifted);
  rtpg.list.updateUi();
 };
 
@@ -230,11 +228,11 @@ rtpg.list.connectUi = function() {
 };
 
 rtpg.list.connectRealtime = function() {
- rtpg.list.field.addEventListener(gapi.drive.realtime.EventType.VALUES_ADDED, rtpg.list.onRealtimeAdded);
- rtpg.list.field.addEventListener(gapi.drive.realtime.EventType.VALUES_REMOVED, rtpg.list.onRealtimeRemoved);
- rtpg.list.field.addEventListener(gapi.drive.realtime.EventType.VALUES_SET, rtpg.list.onRealtimeSet);
+ rtpg.list.field.onValuesAdded(rtpg.list.onRealtimeAdded);
+ rtpg.list.field.onValuesRemoved(rtpg.list.onRealtimeRemoved);
+ rtpg.list.field.onValuesSet(rtpg.list.onRealtimeSet);
 
  if(rtpg.list.cursors){
- rtpg.list.cursors.addEventListener(gapi.drive.realtime.EventType.VALUE_CHANGED, rtpg.list.onRealtimeCursorChange);
+ rtpg.list.cursors.onValueChanged(rtpg.list.onRealtimeCursorChange);
  }
 };
diff --git a/app/js/rtpg.log.js b/app/js/rtpg.log.js
@@ -43,22 +43,22 @@ rtpg.log.logEvent = function(evt, eventType) {
 
  var eventDetails;
  // Collab String events
- if (evt.type == gapi.drive.realtime.EventType.TEXT_INSERTED || evt.type == gapi.drive.realtime.EventType.TEXT_DELETED) {
+ if (evt.type == realtime.store.EventType.TEXT_INSERTED || evt.type == realtime.store.EventType.TEXT_DELETED) {
  eventDetails = '"' + evt.text.replace(/ /g, '\xa0') + '" at index ' + evt.index;
  // Collab Map/Custom Objects property changed events
- } else if (evt.type == gapi.drive.realtime.EventType.VALUE_CHANGED) {
+ } else if (evt.type == realtime.store.EventType.VALUE_CHANGED) {
  eventDetails = 'Property "' + evt.property + '" changed from "' + evt.oldValue + '" to "' + evt.newValue + '"';
  // Collab List Added and Deleted events
- } else if (evt.type == gapi.drive.realtime.EventType.VALUES_ADDED || evt.type == gapi.drive.realtime.EventType.VALUES_REMOVED) {
+ } else if (evt.type == realtime.store.EventType.VALUES_ADDED || evt.type == realtime.store.EventType.VALUES_REMOVED) {
  eventDetails = '"' + evt.values.join(', ') + '" at index ' + evt.index;
  // Collab List Added events
- } else if (evt.type == gapi.drive.realtime.EventType.VALUES_SET) {
+ } else if (evt.type == realtime.store.EventType.VALUES_SET) {
  eventDetails = 'From "' + evt.oldValues.join(', ') + '" to "' + evt.newValues.join(', ') + '" at index ' + evt.index;
  // Reference Shifted events
- } else if (evt.type == gapi.drive.realtime.EventType.REFERENCE_SHIFTED) {
+ } else if (evt.type == realtime.store.EventType.REFERENCE_SHIFTED) {
  eventDetails = 'From ' + evt.oldIndex + ' to ' + evt.newIndex;
  // Collaborators list events
- } else if (evt.type == gapi.drive.realtime.EventType.COLLABORATOR_JOINED || evt.type == gapi.drive.realtime.EventType.COLLABORATOR_LEFT) {
+ } else if (evt.type == realtime.store.EventType.COLLABORATOR_JOINED || evt.type == realtime.store.EventType.COLLABORATOR_LEFT) {
  eventDetails = evt.collaborator.displayName;
  collaborator = evt.collaborator;
  }

diff --git a/app/js/rtpg.map.js b/app/js/rtpg.map.js
@@ -114,5 +114,5 @@ rtpg.map.connectUi = function() {
 
 
 rtpg.map.connectRealtime = function() {
- rtpg.map.field.addEventListener(gapi.drive.realtime.EventType.VALUE_CHANGED, rtpg.map.onRealtime);
+ rtpg.map.field.onValueChanged(rtpg.map.onRealtime);
 };
diff --git a/app/js/rtpg.string.js b/app/js/rtpg.string.js
@@ -80,6 +80,6 @@ rtpg.string.connectUi = function() {
 };
 
 rtpg.string.connectRealtime = function() {
- rtpg.string.field.addEventListener(gapi.drive.realtime.EventType.TEXT_INSERTED, rtpg.string.onRealtimeInsert);
- rtpg.string.field.addEventListener(gapi.drive.realtime.EventType.TEXT_DELETED, rtpg.string.onRealtimeDelete);
+ rtpg.string.field.onTextInserted(rtpg.string.onRealtimeInsert);
+ rtpg.string.field.onTextDeleted(rtpg.string.onRealtimeDelete);
 };