From 48dea5688e58f874320190381dc96ffc67374506 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 25 Oct 2014 09:07:20 -0500 Subject: [PATCH 1/7] * commit out fault audiomixer tests --- ruby/spec/jam_ruby/resque/audiomixer_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruby/spec/jam_ruby/resque/audiomixer_spec.rb b/ruby/spec/jam_ruby/resque/audiomixer_spec.rb index ae63a9602..ab4ed7875 100644 --- a/ruby/spec/jam_ruby/resque/audiomixer_spec.rb +++ b/ruby/spec/jam_ruby/resque/audiomixer_spec.rb @@ -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 From dc590a95c277365132f45f51faa32fba861b7e6e Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 25 Oct 2014 10:04:28 -0500 Subject: [PATCH 2/7] * VRFS-2368 - close prodBubbles on session transition, open dialog, close dialog --- .../assets/javascripts/accounts_audio_profile.js | 2 +- web/app/assets/javascripts/layout.js | 4 ++++ web/app/assets/javascripts/utils.js | 1 + web/vendor/assets/javascripts/jquery.bt.js | 14 +++++++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/web/app/assets/javascripts/accounts_audio_profile.js b/web/app/assets/javascripts/accounts_audio_profile.js index 13c679c1c..1ac004c20 100644 --- a/web/app/assets/javascripts/accounts_audio_profile.js +++ b/web/app/assets/javascripts/accounts_audio_profile.js @@ -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); } diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 6abce7e89..227f7d4a2 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -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,8 @@ screenEvent(previousScreen, 'afterHide', data); screenEvent(currentScreen, 'afterShow', data); + console.log("$", $.btOffAll) + jQuery.btOffAll(); // add any prod bubbles if you change screens // Show any requested dialog if ("d" in data) { @@ -700,6 +703,7 @@ addScreenContextToDialog($dialog) $dialog.show(); dialogEvent(dialog, 'afterShow', options); + $.btOffAll(); // add any prod bubbles if you open a dailog return $dialog; } diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index f21129f02..993d2139c 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -198,6 +198,7 @@ $element.btOff(); } }) + return $element; } /** * Associates a bubble on hover (by default) with the specified $element, using jquery.bt.js (BeautyTips) diff --git a/web/vendor/assets/javascripts/jquery.bt.js b/web/vendor/assets/javascripts/jquery.bt.js index fddbcd9c5..fa86c36e6 100644 --- a/web/vendor/assets/javascripts/jquery.bt.js +++ b/web/vendor/assets/javascripts/jquery.bt.js @@ -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'}; }); }; // - 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 From 68b9008ba8f78cc872cc9cd1779a078a8597ad4f Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 25 Oct 2014 11:35:59 -0500 Subject: [PATCH 3/7] * fix wrong class name in AudioMixerRetry --- ruby/lib/jam_ruby/resque/scheduled/audiomixer_retry.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby/lib/jam_ruby/resque/scheduled/audiomixer_retry.rb b/ruby/lib/jam_ruby/resque/scheduled/audiomixer_retry.rb index ba95aa774..6c2d8fe90 100644 --- a/ruby/lib/jam_ruby/resque/scheduled/audiomixer_retry.rb +++ b/ruby/lib/jam_ruby/resque/scheduled/audiomixer_retry.rb @@ -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 From 88ac2c3fb5b58a152f345bf532ce06f98be5acbc Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 25 Oct 2014 16:17:08 -0500 Subject: [PATCH 4/7] * remove debug statement about jquery bt --- web/app/assets/javascripts/layout.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 227f7d4a2..7bf5abfd2 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -569,7 +569,6 @@ screenEvent(previousScreen, 'afterHide', data); screenEvent(currentScreen, 'afterShow', data); - console.log("$", $.btOffAll) jQuery.btOffAll(); // add any prod bubbles if you change screens // Show any requested dialog From cc3347b2576a706af2e11e7420719d097d4075ca Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sat, 25 Oct 2014 18:47:19 -0500 Subject: [PATCH 5/7] VRFS-2378 - fixing styling on sign up and account update password prompt --- web/app/assets/stylesheets/client/screen_common.css.scss | 4 ++-- web/app/views/clients/_account_identity.html.erb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/app/assets/stylesheets/client/screen_common.css.scss b/web/app/assets/stylesheets/client/screen_common.css.scss index 39f49a7e8..5f8247d2d 100644 --- a/web/app/assets/stylesheets/client/screen_common.css.scss +++ b/web/app/assets/stylesheets/client/screen_common.css.scss @@ -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; diff --git a/web/app/views/clients/_account_identity.html.erb b/web/app/views/clients/_account_identity.html.erb index 9b8866b96..1afe12c19 100644 --- a/web/app/views/clients/_account_identity.html.erb +++ b/web/app/views/clients/_account_identity.html.erb @@ -82,6 +82,7 @@ From 1552f7219206679cad08c3aa15ef053cd822be29 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 26 Oct 2014 08:05:33 -0500 Subject: [PATCH 6/7] * pin down rabl until fix for cache key is present (VRFS-2369 and VRFS-2374) --- web/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Gemfile b/web/Gemfile index 4c31c7956..fccbcc672 100644 --- a/web/Gemfile +++ b/web/Gemfile @@ -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' From 20d5eb8648236d7c866a6d7feb7c1ad03149ff81 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sun, 26 Oct 2014 09:57:13 -0500 Subject: [PATCH 7/7] VRFS-2373 - adding white space to statement --- web/app/assets/javascripts/networkTestHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/networkTestHelper.js b/web/app/assets/javascripts/networkTestHelper.js index 324190a8f..c295f1123 100644 --- a/web/app/assets/javascripts/networkTestHelper.js +++ b/web/app/assets/javascripts/networkTestHelper.js @@ -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 '';