Skip to content

Fix 13 typos in comments, docs and site copy #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avicennasis wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix 13 typos in comments, docs and site copy #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h4 class="text-left">Your site is now TogetherJS enabled.</h4>
<tr class="howto-animation-03">
<td class="col-xs-12 col-sm-6" style="vertical-align:middle">
<h4 class="text-right">Your users can then collaborate in real time!</h4>
<p class="text-right smtextright">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.</p>
<p class="text-right smtextright">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.</p>
</td>
<td class="col-xs-12 col-sm-6">
<div style="position:relative;" class="imagearea">
Expand Down
2 changes: 1 addition & 1 deletion site/js/custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

$( ".howto-animation-01" ).replaceWith( "<div class='col-xs-12'><p><img src='images/togetherjs-how-01-addit.png' alt='...' class='img-rounded img-responsive how-section'></p><h4 class='text-left' style='margin-top:0px'>Add TogetherJS Javascript and HTML to your site.</h4><p class='text-left smtextright'>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.</p></div>" );
$( ".howto-animation-02" ).replaceWith( "<div class='col-xs-12'><p><img src='images/togetherjs-how-02-dock-sm@2x.png' alt='...' class='img-rounded img-responsive how-section'></p><h4 class='text-left' style='margin-top:0px'>Your site is now TogetherJS enabled.</h4><p class='text-left smtextleft'>If your users want to collaborate with a friend, they can click the TogetherJS button on your site.</p></div>" );
$( ".howto-animation-03" ).replaceWith( "<div class='col-xs-12'><p><img src='images/togetherjs-how-03-collaborate-cursors@2x.png' alt='...' class='img-rounded img-responsive how-section'></p><h4 class='text-left' style='margin-top:0px'>Your users can then collaborate in real time!</h4><p class='text-left smtextright'>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.</p></div>" );
$( ".howto-animation-03" ).replaceWith( "<div class='col-xs-12'><p><img src='images/togetherjs-how-03-collaborate-cursors@2x.png' alt='...' class='img-rounded img-responsive how-section'></p><h4 class='text-left' style='margin-top:0px'>Your users can then collaborate in real time!</h4><p class='text-left smtextright'>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.</p></div>" );

$("#features .col-xs-12.col-sm-6").first().css({
marginBottom: "-8px",
Expand Down
2 changes: 1 addition & 1 deletion togetherjs/forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ define(["jquery", "util", "session", "elementFinder", "eventMaker", "templating"
},

destroy: function (el) {
this._editor().destory();
this._editor().destroy();
},

update: function (msg) {
Expand Down
2 changes: 1 addition & 1 deletion togetherjs/jqueryPlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion togetherjs/ot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 3 additions & 3 deletions togetherjs/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion togetherjs/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down
2 changes: 1 addition & 1 deletion togetherjs/videos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion togetherjs/walkthrough.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions togetherjs/youtubeVideos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down