diff --git a/site/index.html b/site/index.html index dd657b153..43e05b276 100644 --- a/site/index.html +++ b/site/index.html @@ -97,7 +97,7 @@

Your site is now TogetherJS enabled.

Your users can then collaborate in real time!

-

Your users can send a unique TogetherJS url to a friend. When the friend opens the link, each user sees the same page and can interact with it together in real time.

+

Your users can send a unique TogetherJS URL to a friend. When the friend opens the link, each user sees the same page and can interact with it together in real time.

diff --git a/site/js/custom.js b/site/js/custom.js index ac0531925..684c8f535 100644 --- a/site/js/custom.js +++ b/site/js/custom.js @@ -77,7 +77,7 @@ $( ".howto-animation-01" ).replaceWith( "

...

Add TogetherJS Javascript and HTML to your site.

Just copy and paste TogetherJS's JS library and HTML snippet into your site or app to give it out-of-the-box collaboration tools and features.

" ); $( ".howto-animation-02" ).replaceWith( "

...

Your site is now TogetherJS enabled.

If your users want to collaborate with a friend, they can click the TogetherJS button on your site.

" ); - $( ".howto-animation-03" ).replaceWith( "

...

Your users can then collaborate in real time!

Your users can send a unique TogetherJS url to a friend. When the friend opens the link, each user sees the same page and can interact with it together in real time.

" ); + $( ".howto-animation-03" ).replaceWith( "

...

Your users can then collaborate in real time!

Your users can send a unique TogetherJS URL to a friend. When the friend opens the link, each user sees the same page and can interact with it together in real time.

" ); $("#features .col-xs-12.col-sm-6").first().css({ marginBottom: "-8px", diff --git a/togetherjs/forms.js b/togetherjs/forms.js index 3c4986dae..496c957d9 100644 --- a/togetherjs/forms.js +++ b/togetherjs/forms.js @@ -355,7 +355,7 @@ define(["jquery", "util", "session", "elementFinder", "eventMaker", "templating" }, destroy: function (el) { - this._editor().destory(); + this._editor().destroy(); }, update: function (msg) { diff --git a/togetherjs/jqueryPlugins.js b/togetherjs/jqueryPlugins.js index 9721f6c4b..af3f9d3d7 100644 --- a/togetherjs/jqueryPlugins.js +++ b/togetherjs/jqueryPlugins.js @@ -257,7 +257,7 @@ define(["jquery"], function ($) { // avatar animate out, reverse of above $.fn.animateDockExit = function () { - // get the current avatar dimenensions + // get the current avatar dimensions var height = this.height(); var width = this.width(); var backgroundSize = height + 4; diff --git a/togetherjs/ot.js b/togetherjs/ot.js index 570b0543f..948e73abb 100644 --- a/togetherjs/ot.js +++ b/togetherjs/ot.js @@ -388,7 +388,7 @@ define(["util"], function (util) { // First we check if we need to modify this change because we // know about changes that it should know about (changes that - // preceed it that are in our local history). + // precede it that are in our local history). var clientsToCheck = StringSet(); for (var clientId in this.known) { if (! this.known.hasOwnProperty(clientId)) { diff --git a/togetherjs/session.js b/togetherjs/session.js index 62e6006a0..4c3033ee9 100644 --- a/togetherjs/session.js +++ b/togetherjs/session.js @@ -262,7 +262,7 @@ define(["require", "util", "channels", "jquery", "storage"], function (require, storage.set("identityId", identityId); } session.identityId = identityId; - // We don't actually have to wait for the set to succede, so + // We don't actually have to wait for the set to succeed, so // long as session.identityId is set def.resolve(); }); @@ -460,8 +460,8 @@ define(["require", "util", "channels", "jquery", "storage"], function (require, }); function hashchangeEvent() { - // needed because when message arives from peer this variable will be checked to - // decide weather to show actions or not + // needed because when message arrives from peer this variable will be checked to + // decide whether to show actions or not sendHello(false); } diff --git a/togetherjs/ui.js b/togetherjs/ui.js index 5c0e8fc81..f502810cc 100644 --- a/togetherjs/ui.js +++ b/togetherjs/ui.js @@ -830,7 +830,7 @@ define(["require", "jquery", "util", "session", "templates", "templating", "link // remove bg overlay //$(".overlay").remove(); - //after hitting End, reset window draggin + //after hitting End, reset window dragging $("body").css({ "position": "", top: "", diff --git a/togetherjs/videos.js b/togetherjs/videos.js index 080fe115a..ace044785 100644 --- a/togetherjs/videos.js +++ b/togetherjs/videos.js @@ -95,7 +95,7 @@ function ($, util, session, elementFinder) { var oldTime = element.prop('currentTime'); var newTime = msg.position; - //to help throttle uneccesary position changes + //to help throttle unnecessary position changes if(areTooFarApart(oldTime, newTime)){ setTime(element, msg.position); } diff --git a/togetherjs/walkthrough.js b/togetherjs/walkthrough.js index 9acd32236..ce0bdf838 100644 --- a/togetherjs/walkthrough.js +++ b/togetherjs/walkthrough.js @@ -69,7 +69,7 @@ define(["util", "ui", "jquery", "windowing", "templates", "templating", "session container.find("#togetherjs-avatar-when-unsaved").show(); } }); - // This triggers substititions in the walkthrough: + // This triggers substitutions in the walkthrough: peers.Self.update({}); session.emit("new-element", container); } diff --git a/togetherjs/youtubeVideos.js b/togetherjs/youtubeVideos.js index 95d6a9ee1..5d0952838 100644 --- a/togetherjs/youtubeVideos.js +++ b/togetherjs/youtubeVideos.js @@ -91,7 +91,7 @@ function ($, util, session, elementFinder) { iframes.each(function (i, iframe) { // if the iframe's unique id is already set, skip it // FIXME: what if the user manually sets an iframe's id (i.e. "#my-youtube")? - // maybe we should set iframes everytime togetherjs is reinitialized? + // maybe we should set iframes every time togetherjs is reinitialized? var osrc = $(iframe).attr("src"), src = osrc; if ((src || "").indexOf("youtube") != -1 && !$(iframe).attr("id")) { $(iframe).attr("id", "youtube-player"+i); @@ -213,7 +213,7 @@ function ($, util, session, elementFinder) { // We must prevent advanced videos from going out of sync player.pauseVideo(); if (areTooFarApart(currentTime, msg.playerTime)) { - // "seek" flag will help supress publishing unwanted state changes + // "seek" flag will help suppress publishing unwanted state changes $(player).data("seek", true); player.seekTo(msg.playerTime, true); }