From a43399a95d9aae0651205269dad7b687a4604f12 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Wed, 5 Feb 2014 02:12:38 +0000
Subject: [PATCH] * more error handling

---
 admin/script/package/jam-admin.conf                  |  2 +-
 web/app/assets/javascripts/shareDialog.js            | 12 ++----------
 web/app/views/clients/_shareDialog.html.erb          |  2 +-
 web/script/package/jam-web.conf                      |  2 +-
 .../script/package/websocket-gateway.conf            |  2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/admin/script/package/jam-admin.conf b/admin/script/package/jam-admin.conf
index c429d3209..a13725e24 100644
--- a/admin/script/package/jam-admin.conf
+++ b/admin/script/package/jam-admin.conf
@@ -12,4 +12,4 @@ pre-start script
     chown jam-admin:jam-admin /var/run/jam-admin
 end script
 
-exec start-stop-daemon --start --chdir /var/lib/jam-admin --exec /var/lib/jam-admin/script/package/upstart-run.sh 
+exec start-stop-daemon --start --chdir /var/lib/jam-admin --exec /var/lib/jam-admin/script/package/upstart-run.sh
diff --git a/web/app/assets/javascripts/shareDialog.js b/web/app/assets/javascripts/shareDialog.js
index 64d7e4c42..3b798cf91 100644
--- a/web/app/assets/javascripts/shareDialog.js
+++ b/web/app/assets/javascripts/shareDialog.js
@@ -5,31 +5,25 @@
     context.JK.ShareDialog = function(app, entityId, entityType) {
         var logger = context.JK.logger;
         var rest = context.JK.Rest();
-        var dialogId = '#share-dialog'
 
         function socialShare() {
             var shareWithFacebook = $('.share-with-facebook').is(':checked');
             var shareWithGoogle = $('.share-with-google').is(':checked');
             var shareWithTwitter = $('.share-with-twitter').is(':checked');
 
+            console.log("")
             if(!shareWithFacebook && !shareWithGoogle && !shareWithTwitter) {
                 $('.share-options').addClass('error')
             }
         }
         function registerEvents(onOff) {
 
-            $('#dialog-share-button').unbind('click').click(function(e){
+            $('.dialog-share-button').unbind('click').click(function(e){
                 socialShare();
                 return false;
             });
         }
 
-        this.fb_login = function() {
-            FB.login(function(response) {
-                handle_fblogin_response(response);
-            }, {scope:'publish_stream'});
-        }
-
         function showDialog() {
             app.layout.showDialog('share-dialog');
         }
@@ -113,8 +107,6 @@
             };
 
             app.bindDialog('shareRecording', dialogBindings);
-
-           // callFB(fbAppID);
         };
 
         this.initialize = initialize;
diff --git a/web/app/views/clients/_shareDialog.html.erb b/web/app/views/clients/_shareDialog.html.erb
index 9c411df14..917bf4415 100644
--- a/web/app/views/clients/_shareDialog.html.erb
+++ b/web/app/views/clients/_shareDialog.html.erb
@@ -14,7 +14,7 @@
                             <%= image_tag "content/icon_twitter.png", :size => "24x24", :align => "absmiddle", :alt => "", :style => "vertical-align:middle", :class => "share-with-twitter"  %>&nbsp;
                             <input type="checkbox" />
                             <%= image_tag "content/icon_google.png", :size => "24x24", :align => "absmiddle", :alt => "", :style => "vertical-align:middle", :class => "share-with-google"  %>&nbsp;
-                        <div class="error-msg"
+                            <div class="error-msg">Please select at least one</div>
                         </div>
                         <div class=" right mr10 mt5"><a class="button-orange dialog-share-button">SHARE</a></div>
                 </td>
diff --git a/web/script/package/jam-web.conf b/web/script/package/jam-web.conf
index b85686a76..e06483517 100755
--- a/web/script/package/jam-web.conf
+++ b/web/script/package/jam-web.conf
@@ -12,4 +12,4 @@ pre-start script
     chown jam-web:jam-web /var/run/jam-web
 end script
 
-exec start-stop-daemon --start --chdir /var/lib/jam-web --exec /var/lib/jam-web/script/package/upstart-run.sh 
+exec start-stop-daemon --start --chdir /var/lib/jam-web --exec /var/lib/jam-web/script/package/upstart-run.sh
diff --git a/websocket-gateway/script/package/websocket-gateway.conf b/websocket-gateway/script/package/websocket-gateway.conf
index 9328c3e9f..352405981 100755
--- a/websocket-gateway/script/package/websocket-gateway.conf
+++ b/websocket-gateway/script/package/websocket-gateway.conf
@@ -12,4 +12,4 @@ pre-start script
     chown websocket-gateway:websocket-gateway /var/run/websocket-gateway
 end script
 
-exec start-stop-daemon --start --chdir /var/lib/websocket-gateway --exec /var/lib/websocket-gateway/script/package/upstart-run.sh 
+exec start-stop-daemon --start --chdir /var/lib/websocket-gateway --exec /var/lib/websocket-gateway/script/package/upstart-run.sh