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

Merge branch 'develop' into feature/rsvp_slot_conflict

This commit is contained in:
Brian Smith 2014-10-26 12:41:17 -04:00
parent c57ea372ac 20d5eb8648
commit 709150edac
10 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/resque/scheduled/audiomixer_retry.rb
View File

@ -22,7 +22,7 @@ module JamRuby
def self.perform
AudioMixer.queue_jobs_needing_retry
QuickMixer.queue_jobs_needing_retry
Recording.cleanup_excessive_storage
QuickMix.cleanup_excessive_storage
end
end

2
ruby/spec/jam_ruby/resque/audiomixer_spec.rb
View File

@ -140,6 +140,7 @@ describe AudioMixer do
File.read(audiomixer.manifest[:error_out]).should == "some_error"
end
end
=begin
describe "integration" do
@ -308,5 +309,6 @@ describe AudioMixer do
end
end
end
=end
end

2
web/Gemfile
View File

@ -34,7 +34,7 @@ gem 'uuidtools', '2.1.2'
gem 'ruby-protocol-buffers', '1.2.2'
gem 'pg', '0.17.1'
gem 'compass-rails', '1.1.3' # 1.1.4 throws an exception on startup about !initialize on nil
gem 'rabl' # for JSON API development
gem 'rabl', '0.11.0' # for JSON API development
gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables
gem 'eventmachine', '1.0.3'
gem 'amqp', '0.9.8'

2
web/app/assets/javascripts/accounts_audio_profile.js
View File

@ -93,7 +93,7 @@
var profiles = populateAccountAudio();
if(profiles.length <= 1) {
setTimeout(function() {
context.JK.prodBubble($addNewGearBtn, 'no-audio-profiles', {}, {positions: ['bottom'], offsetParent: $addNewGearBtn.closest('.screen')});
context.JK.prodBubble($addNewGearBtn, 'no-audio-profiles', {}, {positions: ['bottom'], offsetParent: $addNewGearBtn.closest('.screen')})
}, 1000);
}

3
web/app/assets/javascripts/layout.js
View File

@ -462,6 +462,7 @@
$dialog.triggerHandler(EVENTS.DIALOG_CLOSED, {name: dialog, dialogCount: openDialogs.length, result: $dialog.data('result'), canceled: canceled });
$(context).triggerHandler(EVENTS.DIALOG_CLOSED, {name: dialog, dialogCount: openDialogs.length, result: $dialog.data('result'), canceled: canceled });
dialogEvent(dialog, 'afterHide');
$.btOffAll(); // add any prod bubbles if you close a dialog
}
function screenEvent(screen, evtName, data) {
@ -568,6 +569,7 @@
screenEvent(previousScreen, 'afterHide', data);
screenEvent(currentScreen, 'afterShow', data);
jQuery.btOffAll(); // add any prod bubbles if you change screens
// Show any requested dialog
if ("d" in data) {
@ -700,6 +702,7 @@
addScreenContextToDialog($dialog)
$dialog.show();
dialogEvent(dialog, 'afterShow', options);
$.btOffAll(); // add any prod bubbles if you open a dailog
return $dialog;
}

2
web/app/assets/javascripts/networkTestHelper.js
View File

@ -156,7 +156,7 @@
function appendContextualStatement() {
if (inGearWizard) {
return "You can skip this step for now."
return " You can skip this step for now."
}
else {
return '';

1
web/app/assets/javascripts/utils.js
View File

@ -198,6 +198,7 @@
$element.btOff();
}
})
return $element;
}
/**
* Associates a bubble on hover (by default) with the specified $element, using jquery.bt.js (BeautyTips)

4
web/app/assets/stylesheets/client/screen_common.css.scss
View File

@ -387,7 +387,7 @@ small, .small {font-size:11px;}
.overlay-small {
width:300px;
height:160px;
//height:160px;
position:absolute;
left:50%;
top:20%;
@ -399,7 +399,7 @@ small, .small {font-size:11px;}
.overlay-inner {
width:250px;
height:130px;
//height:130px;
padding:25px;
font-size:15px;
color:#aaa;

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

@ -82,6 +82,7 @@
</script>
<script type="text/template" id="template-account-update-email-password-prompt-dialog">
<br />
<form>
Enter Password:<br />
<input id="update-email-confirm-password" name="password" type="password">
@ -91,4 +92,5 @@
<div class="left"><a href="#" id="account-edit-email-confirm-password-cancel" class="button-grey m0" data-purpose="cancel">CANCEL</a></div>
<div class="right"><a href="#" id="account-edit-email-confirm-password-submit" class="button-orange" data-purpose="submit">SUBMIT</a></div>
<br />
</script>

14
web/vendor/assets/javascripts/jquery.bt.js vendored
View File

@ -709,6 +709,9 @@ jQuery.bt = {version: '0.9.7'};
jQuery.bt.vars.closeWhenOpenStack.push(this);
}
// MSC: track all bt's open
jQuery.bt.vars.allOpenStack.push(this);
// trigger postShow function
// function receives the box element (the balloon wrapper div) as an argument
opts.postShow.apply(this, [$box[0]]);
@ -747,6 +750,8 @@ jQuery.bt = {version: '0.9.7'};
// remove this from the stacks
jQuery.bt.vars.clickAnywhereStack = arrayRemove(jQuery.bt.vars.clickAnywhereStack, i);
jQuery.bt.vars.closeWhenOpenStack = arrayRemove(jQuery.bt.vars.closeWhenOpenStack, i);
// MSC: track all bt's open
jQuery.bt.vars.allOpenStack = arrayRemove(jQuery.bt.vars.allOpenStack, i);
// remove the 'bt-active' and activeClass classes from target
$(i).removeClass('bt-active ' + opts.activeClass);
@ -1069,7 +1074,14 @@ jQuery.bt = {version: '0.9.7'};
});
}; // </ $().btOff() >
jQuery.bt.vars = {clickAnywhereStack: [], closeWhenOpenStack: []};
/**
* Turn off all open beauty tips
*/
jQuery.btOffAll = function() {
$(jQuery.bt.vars.allOpenStack).btOff();
}
jQuery.bt.vars = {clickAnywhereStack: [], closeWhenOpenStack: [], allOpenStack: []};
/**
* This function gets bound to the document's click event