From b179869606dccb6f180a523811caecd47d113ae2 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 9 Jun 2015 08:19:03 -0500 Subject: [PATCH] * working on build issues still --- web/app/assets/javascripts/application.js | 1 - web/app/assets/javascripts/client_init.js.coffee | 4 ++-- .../stores/BroadcastNotificationStore.js.coffee | 5 +++-- web/config/routes.rb | 3 +++ web/{app => vendor}/assets/javascripts/AAC_underscore.js | 0 web/vendor/assets/javascripts/{bugsnag.js => bugsnag.js.erb} | 4 +--- 6 files changed, 9 insertions(+), 8 deletions(-) rename web/{app => vendor}/assets/javascripts/AAC_underscore.js (100%) rename web/vendor/assets/javascripts/{bugsnag.js => bugsnag.js.erb} (99%) diff --git a/web/app/assets/javascripts/application.js b/web/app/assets/javascripts/application.js index 62d5148b5..1ef62d890 100644 --- a/web/app/assets/javascripts/application.js +++ b/web/app/assets/javascripts/application.js @@ -38,7 +38,6 @@ //= require jquery.exists //= require jquery.payment //= require jquery.visible -//= require es5-shim //= require reflux //= require howler.core.js //= require jstz diff --git a/web/app/assets/javascripts/client_init.js.coffee b/web/app/assets/javascripts/client_init.js.coffee index 9dd28a8d7..460eb1aa6 100644 --- a/web/app/assets/javascripts/client_init.js.coffee +++ b/web/app/assets/javascripts/client_init.js.coffee @@ -19,8 +19,8 @@ context.JK.ClientInit = class ClientInit setTimeout(this.checkBroadcastNotification, 3000) checkBroadcastNotification: () => - console.log("broadcastActions", broadcastActions) - broadcastActions.load.triggerPromise() + if context.JK.userId + broadcastActions.load.triggerPromise() nativeClientInit: () => diff --git a/web/app/assets/javascripts/react-components/stores/BroadcastNotificationStore.js.coffee b/web/app/assets/javascripts/react-components/stores/BroadcastNotificationStore.js.coffee index 943dd5564..6f8254755 100644 --- a/web/app/assets/javascripts/react-components/stores/BroadcastNotificationStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/BroadcastNotificationStore.js.coffee @@ -25,8 +25,9 @@ BroadcastNotificationStore = Reflux.createStore( onLoadCompleted: () => logger.debug("broadcast notification sync completed") - onLoadFailed: () => - logger.error("broadcast notification sync failed") + onLoadFailed: (jqXHR) => + if jqXHR.status != 404 + logger.error("broadcast notification sync failed") } ) diff --git a/web/config/routes.rb b/web/config/routes.rb index 7c6c5bd27..c379a16de 100644 --- a/web/config/routes.rb +++ b/web/config/routes.rb @@ -374,6 +374,9 @@ SampleApp::Application.routes.draw do match '/users/:id/share/session/:provider' => 'api_users#share_session', :via => :get match '/users/:id/share/recording/:provider' => 'api_users#share_recording', :via => :get + # broadcast notification + match '/users/:id/broadcast_notification' => 'api_users#broadcast_notification', :via => :get + # session chat match '/chat' => 'api_chats#create', :via => :post match '/sessions/:music_session/chats' => 'api_chats#index', :via => :get diff --git a/web/app/assets/javascripts/AAC_underscore.js b/web/vendor/assets/javascripts/AAC_underscore.js similarity index 100% rename from web/app/assets/javascripts/AAC_underscore.js rename to web/vendor/assets/javascripts/AAC_underscore.js diff --git a/web/vendor/assets/javascripts/bugsnag.js b/web/vendor/assets/javascripts/bugsnag.js.erb similarity index 99% rename from web/vendor/assets/javascripts/bugsnag.js rename to web/vendor/assets/javascripts/bugsnag.js.erb index 0bdefaadb..979438309 100644 --- a/web/vendor/assets/javascripts/bugsnag.js +++ b/web/vendor/assets/javascripts/bugsnag.js.erb @@ -1,10 +1,8 @@ // 2.4.8 http://d2wy8f7a9ursnm.cloudfront.net/bugsnag-2.4.8.min.js - // START COPY/PASTE FROM BUGSNAG CDN !function(a,b){function c(a,b){try{if("function"!=typeof a)return a;if(!a.bugsnag){var c=e();a.bugsnag=function(d){if(b&&b.eventHandler&&(u=d),v=c,!y){var e=a.apply(this,arguments);return v=null,e}try{return a.apply(this,arguments)}catch(f){throw l("autoNotify",!0)&&(x.notifyException(f,null,null,"error"),s()),f}finally{v=null}},a.bugsnag.bugsnag=a.bugsnag}return a.bugsnag}catch(d){return a}}function d(){B=!1}function e(){var a=document.currentScript||v;if(!a&&B){var b=document.scripts||document.getElementsByTagName("script");a=b[b.length-1]}return a}function f(a){var b=e();b&&(a.script={src:b.src,content:l("inlineScript",!0)?b.innerHTML:""})}function g(b){var c=l("disableLog"),d=a.console;void 0===d||void 0===d.log||c||d.log("[Bugsnag] "+b)}function h(b,c,d){if(d>=5)return encodeURIComponent(c)+"=[RECURSIVE]";d=d+1||1;try{if(a.Node&&b instanceof a.Node)return encodeURIComponent(c)+"="+encodeURIComponent(r(b));var e=[];for(var f in b)if(b.hasOwnProperty(f)&&null!=f&&null!=b[f]){var g=c?c+"["+f+"]":f,i=b[f];e.push("object"==typeof i?h(i,g,d):encodeURIComponent(g)+"="+encodeURIComponent(i))}return e.join("&")}catch(j){return encodeURIComponent(c)+"="+encodeURIComponent(""+j)}}function i(a,b){if(null==b)return a;a=a||{};for(var c in b)if(b.hasOwnProperty(c))try{a[c]=b[c].constructor===Object?i(a[c],b[c]):b[c]}catch(d){a[c]=b[c]}return a}function j(a,b){a+="?"+h(b)+"&ct=img&cb="+(new Date).getTime();var c=new Image;c.src=a}function k(a){var b={},c=/^data\-([\w\-]+)$/;if(a)for(var d=a.attributes,e=0;e\n";var f=[];try{for(var h=arguments.callee.caller.caller;h&&f.length"}return a.nodeName}}function s(){z+=1,a.setTimeout(function(){z-=1})}function t(a,b,c){var d=a[b],e=c(d);a[b]=e}var u,v,w,x={},y=!0,z=0,A=10;x.noConflict=function(){return a.Bugsnag=b,x},x.refresh=function(){A=10},x.notifyException=function(a,b,c,d){b&&"string"!=typeof b&&(c=b,b=void 0),c||(c={}),f(c),n({name:b||a.name,message:a.message||a.description,stacktrace:p(a)||o(),file:a.fileName||a.sourceURL,lineNumber:a.lineNumber||a.line,columnNumber:a.columnNumber?a.columnNumber+1:void 0,severity:d||"warning"},c)},x.notify=function(b,c,d,e){n({name:b,message:c,stacktrace:o(),file:a.location.toString(),lineNumber:1,severity:e||"warning"},d)};var B="complete"!==document.readyState;document.addEventListener?(document.addEventListener("DOMContentLoaded",d,!0),a.addEventListener("load",d,!0)):a.attachEvent("onload",d);var C,D=/^[0-9a-f]{32}$/i,E=/function\s*([\w\-$]+)?\s*\(/i,F="https://notify.bugsnag.com/",G=F+"js",H="2.4.8",I=document.getElementsByTagName("script"),J=I[I.length-1];if(a.atob){if(a.ErrorEvent)try{0===new a.ErrorEvent("test").colno&&(y=!1)}catch(K){}}else y=!1;if(l("autoNotify",!0)){t(a,"onerror",function(b){return function(c,d,e,g,h){var i=l("autoNotify",!0),j={};!g&&a.event&&(g=a.event.errorCharacter),f(j),v=null,i&&!z&&n({name:h&&h.name||"window.onerror",message:c,file:d,lineNumber:e,columnNumber:g,stacktrace:h&&p(h)||o(),severity:"error"},j),b&&b(c,d,e,g,h)}});var L=function(a){return function(b,d){if("function"==typeof b){b=c(b);var e=Array.prototype.slice.call(arguments,2);return a(function(){b.apply(this,e)},d)}return a(b,d)}};t(a,"setTimeout",L),t(a,"setInterval",L),a.requestAnimationFrame&&t(a,"requestAnimationFrame",function(a){return function(b){return a(c(b))}}),a.setImmediate&&t(a,"setImmediate",function(a){return function(){var b=Array.prototype.slice.call(arguments);return b[0]=c(b[0]),a.apply(this,b)}}),"EventTarget Window Node ApplicationCache AudioTrackList ChannelMergerNode CryptoOperation EventSource FileReader HTMLUnknownElement IDBDatabase IDBRequest IDBTransaction KeyOperation MediaController MessagePort ModalWindow Notification SVGElementInstance Screen TextTrack TextTrackCue TextTrackList WebSocket WebSocketWorker Worker XMLHttpRequest XMLHttpRequestEventTarget XMLHttpRequestUpload".replace(/\w+/g,function(b){var d=a[b]&&a[b].prototype;d&&d.hasOwnProperty&&d.hasOwnProperty("addEventListener")&&(t(d,"addEventListener",function(a){return function(b,d,e,f){try{d&&d.handleEvent&&(d.handleEvent=c(d.handleEvent,{eventHandler:!0}))}catch(h){g(h)}return a.call(this,b,c(d,{eventHandler:!0}),e,f)}}),t(d,"removeEventListener",function(a){return function(b,d,e,f){return a.call(this,b,d,e,f),a.call(this,b,c(d),e,f)}}))})}a.Bugsnag=x,"function"==typeof define&&define.amd?define([],function(){return x}):"object"==typeof module&&"object"==typeof module.exports&&(module.exports=x)}(window,window.Bugsnag); // END COPY/PASTE FROM BUGSNAG CDN - // manual code: make sure Bugsnag has it's API KEY -window.Bugsnag.apiKey = gon.global.bugsnag_key \ No newline at end of file +window.Bugsnag.apiKey = gon.global.bugsnag_key