seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* more error handling

This commit is contained in:
Seth Call 2014-02-05 02:12:38 +00:00
parent badeb5ba70
commit a43399a95d
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/script/package/jam-admin.conf
View File

@ -12,4 +12,4 @@ pre-start script
chown jam-admin:jam-admin /var/run/jam-admin chown jam-admin:jam-admin /var/run/jam-admin
end script 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

12
web/app/assets/javascripts/shareDialog.js
View File

@ -5,31 +5,25 @@
context.JK.ShareDialog = function(app, entityId, entityType) { context.JK.ShareDialog = function(app, entityId, entityType) {
var logger = context.JK.logger; var logger = context.JK.logger;
var rest = context.JK.Rest(); var rest = context.JK.Rest();
var dialogId = '#share-dialog'
function socialShare() { function socialShare() {
var shareWithFacebook = $('.share-with-facebook').is(':checked'); var shareWithFacebook = $('.share-with-facebook').is(':checked');
var shareWithGoogle = $('.share-with-google').is(':checked'); var shareWithGoogle = $('.share-with-google').is(':checked');
var shareWithTwitter = $('.share-with-twitter').is(':checked'); var shareWithTwitter = $('.share-with-twitter').is(':checked');
console.log("")
if(!shareWithFacebook && !shareWithGoogle && !shareWithTwitter) { if(!shareWithFacebook && !shareWithGoogle && !shareWithTwitter) {
$('.share-options').addClass('error') $('.share-options').addClass('error')
} }
} }
function registerEvents(onOff) { function registerEvents(onOff) {
$('#dialog-share-button').unbind('click').click(function(e){ $('.dialog-share-button').unbind('click').click(function(e){
socialShare(); socialShare();
return false; return false;
}); });
} }
this.fb_login = function() {
FB.login(function(response) {
handle_fblogin_response(response);
}, {scope:'publish_stream'});
}
function showDialog() { function showDialog() {
app.layout.showDialog('share-dialog'); app.layout.showDialog('share-dialog');
} }
@ -113,8 +107,6 @@
}; };
app.bindDialog('shareRecording', dialogBindings); app.bindDialog('shareRecording', dialogBindings);
// callFB(fbAppID);
}; };
this.initialize = initialize; this.initialize = initialize;

2
web/app/views/clients/_shareDialog.html.erb
View File

@ -14,7 +14,7 @@
<%= image_tag "content/icon_twitter.png", :size => "24x24", :align => "absmiddle", :alt => "", :style => "vertical-align:middle", :class => "share-with-twitter" %>&nbsp; <%= image_tag "content/icon_twitter.png", :size => "24x24", :align => "absmiddle", :alt => "", :style => "vertical-align:middle", :class => "share-with-twitter" %>&nbsp;
<input type="checkbox" /> <input type="checkbox" />
<%= image_tag "content/icon_google.png", :size => "24x24", :align => "absmiddle", :alt => "", :style => "vertical-align:middle", :class => "share-with-google" %>&nbsp; <%= 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>
<div class=" right mr10 mt5"><a class="button-orange dialog-share-button">SHARE</a></div> <div class=" right mr10 mt5"><a class="button-orange dialog-share-button">SHARE</a></div>
</td> </td>

2
web/script/package/jam-web.conf
View File

@ -12,4 +12,4 @@ pre-start script
chown jam-web:jam-web /var/run/jam-web chown jam-web:jam-web /var/run/jam-web
end script 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

2
websocket-gateway/script/package/websocket-gateway.conf
View File

@ -12,4 +12,4 @@ pre-start script
chown websocket-gateway:websocket-gateway /var/run/websocket-gateway chown websocket-gateway:websocket-gateway /var/run/websocket-gateway
end script 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