From a41c37ec0334a46ff0433d9ae80d103dc49c1a1e Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sat, 21 Feb 2015 01:17:54 -0800 Subject: [PATCH] add together.js --- app.js | 5 +++++ views/layout-wide.jade | 1 + views/layout.jade | 1 + views/partials/navbar.jade | 2 ++ 4 files changed, 9 insertions(+) diff --git a/app.js b/app.js index dff8270448..5ef88dabe6 100644 --- a/app.js +++ b/app.js @@ -139,6 +139,11 @@ var trusted = [ '*.ionicframework.com', 'https://syndication.twitter.com', '*.youtube.com', + '*.jsdelivr.net', + '*.togetherjs.com', + 'https://*.togetherjs.com', + 'wss://hub.togetherjs.com', + '*.ytimg.com' ]; app.use(helmet.contentSecurityPolicy({ diff --git a/views/layout-wide.jade b/views/layout-wide.jade index 33873b2bf2..64cf87de8b 100644 --- a/views/layout-wide.jade +++ b/views/layout-wide.jade @@ -4,6 +4,7 @@ html(ng-app='profileValidation', lang='en') script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") + script(src="https://togetherjs.com/togetherjs-min.js") link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css') diff --git a/views/layout.jade b/views/layout.jade index 6e5cadeefd..360dc4bd6c 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -4,6 +4,7 @@ html(ng-app='profileValidation', lang='en') script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js") script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") + script(src="https://togetherjs.com/togetherjs-min.js") link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css') include partials/meta diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 5b895c57ba..a936228c0d 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -16,6 +16,8 @@ a(href='http://forum.freecodecamp.com' target='_blank') Forum li a(href='/bonfires') Bonfires + li + a(href="#" onclick="TogetherJS(this); return false;") Pair if !user li       li