Merge branch 'voxmedia-multi-cursor-show-flag-on-shift' into develop

Author: jhchen

Diff for: src/modules/multi-cursor.coffee

@@ -61,8 +61,12 @@ class MultiCursor extends EventEmitter2
 
   shiftCursors: (index, length, authorId = null) ->
     _.each(@cursors, (cursor, id) =>
-      return unless cursor and (cursor.index > index or cursor.userId == authorId)
-      cursor.index += Math.max(length, index - cursor.index)
+      return unless cursor
+      shift = Math.max(length, index - cursor.index)
+      if cursor.userId == authorId
+        this.moveCursor(authorId, cursor.index + shift)
+      else if cursor.index > index
+        cursor.index += shift
     )
 
   update: ->