From eed521fb8ce6506d50af159f704ff8a680f2ce8a Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Fri, 4 Jul 2014 17:54:30 -0700
Subject: [PATCH] Merged conflicts.

---
 app/lib/services/facebook.coffee    | 24 ++++++++++++------------
 app/views/editor/delta.coffee       |  2 +-
 app/views/editor/patch_modal.coffee |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/lib/services/facebook.coffee b/app/lib/services/facebook.coffee
index b9223334c..e4e08d52d 100644
--- a/app/lib/services/facebook.coffee
+++ b/app/lib/services/facebook.coffee
@@ -2,25 +2,25 @@ module.exports = initializeFacebook = ->
   # Additional JS functions here
   window.fbAsyncInit = ->
     FB.init
-      appId: (if document.location.origin is "http://localhost:3000" then "607435142676437" else "148832601965463") # App ID
-      channelUrl: document.location.origin + "/channel.html" # Channel File
+      appId: (if document.location.origin is 'http://localhost:3000' then '607435142676437' else '148832601965463') # App ID
+      channelUrl: document.location.origin + '/channel.html' # Channel File
       status: true # check login status
       cookie: true # enable cookies to allow the server to access the session
       xfbml: true # parse XFBML
 
-    Backbone.Mediator.publish "fbapi-loaded"
+    Backbone.Mediator.publish 'fbapi-loaded'
 
     # This is fired for any auth related change, such as login, logout or session refresh.
-    FB.Event.subscribe "auth.authResponseChange", (response) ->
+    FB.Event.subscribe 'auth.authResponseChange', (response) ->
 
       # Here we specify what we do with the response anytime this event occurs.
-      if response.status is "connected"
+      if response.status is 'connected'
 
         # They have logged in to the app.
-        Backbone.Mediator.publish "facebook-logged-in",
+        Backbone.Mediator.publish 'facebook-logged-in',
           response: response
 
-      else if response.status is "not_authorized"
+      else if response.status is 'not_authorized'
         #
       else
 	      #
@@ -28,15 +28,15 @@ module.exports = initializeFacebook = ->
   # Load the SDK asynchronously
   ((d) ->
     js = undefined
-    id = "facebook-jssdk"
-    ref = d.getElementsByTagName("script")[0]
+    id = 'facebook-jssdk'
+    ref = d.getElementsByTagName('script')[0]
     return  if d.getElementById(id)
-    js = d.createElement("script")
+    js = d.createElement('script')
     js.id = id
     js.async = true
-    js.src = "//connect.facebook.net/en_US/all.js"
+    js.src = '//connect.facebook.net/en_US/all.js'
 
-    #js.src = "//connect.facebook.net/en_US/all/debug.js"
+    #js.src = '//connect.facebook.net/en_US/all/debug.js'
     ref.parentNode.insertBefore js, ref
     return
   ) document
diff --git a/app/views/editor/delta.coffee b/app/views/editor/delta.coffee
index 47977cbc4..fe0f875da 100644
--- a/app/views/editor/delta.coffee
+++ b/app/views/editor/delta.coffee
@@ -21,7 +21,7 @@ module.exports = class DeltaView extends CocoView
   ###
   
   @deltaCounter: 0
-  className: "delta-view"
+  className: 'delta-view'
   template: template
 
   constructor: (options) ->
diff --git a/app/views/editor/patch_modal.coffee b/app/views/editor/patch_modal.coffee
index 8ff75c34a..37361e129 100644
--- a/app/views/editor/patch_modal.coffee
+++ b/app/views/editor/patch_modal.coffee
@@ -4,7 +4,7 @@ DeltaView = require 'views/editor/delta'
 auth = require 'lib/auth'
 
 module.exports = class PatchModal extends ModalView
-  id: "patch-modal"
+  id: 'patch-modal'
   template: template
   plain: true
   modalWidthPercent: 60