Skip to content
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.

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

Spelling #924

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module.exports = function(grunt) {
files: [
// Includes
'src/js/**/*.js',
// Exludes
// Excludes
// TODO: remove this (for now we still get warnings from the lib folder)
'!src/js/**/lib/**/*.js'
],
Expand Down
2 changes: 1 addition & 1 deletion src/css/dialogs-cheatsheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
color: white;
}

.cheatsheet-shorcut-conflict .cheatsheet-key {
.cheatsheet-shortcut-conflict .cheatsheet-key {
border-color: red;
color: red;
}
Expand Down
2 changes: 1 addition & 1 deletion src/css/toolbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

.toolbox-buttons .button {
/* Override border propery on .button elements from form.css */
/* Override border property on .button elements from form.css */
border-style: solid;
border-color: #333;
border-width: 0 1px 0 0;
Expand Down
6 changes: 3 additions & 3 deletions src/js/controller/FramesListController.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,16 @@
var scrollerHeight = scroller.offsetHeight;
var scrollTop = scroller.scrollTop;
var scrollerContentHeight = this.previewList.offsetHeight;
var treshold = this.container.querySelector('.top-overflow').offsetHeight;
var threshold = this.container.querySelector('.top-overflow').offsetHeight;
var overflowTop = false;
var overflowBottom = false;

if (scrollerHeight < scrollerContentHeight) {
if (scrollTop > treshold) {
if (scrollTop > threshold) {
overflowTop = true;
}
var scrollBottom = (scrollerContentHeight - scrollTop) - scrollerHeight;
if (scrollBottom > treshold) {
if (scrollBottom > threshold) {
overflowBottom = true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/controller/piskel/PiskelController.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
if (piskel) {
this.setPiskel(piskel);
} else {
throw 'A piskel instance is mandatory for instanciating PiskelController';
throw 'A piskel instance is mandatory for instantiating PiskelController';
}
};

Expand Down
4 changes: 2 additions & 2 deletions src/js/controller/settings/exportimage/PngExportController.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
};

/**
* Initalize all controls related to the spritesheet layout.
* Initialize all controls related to the spritesheet layout.
*/
ns.PngExportController.prototype.initLayoutSection_ = function () {
var frames = this.piskelController.getFrameCount();
Expand Down Expand Up @@ -107,7 +107,7 @@
};

/**
* Synchronise column and row inputs, called everytime a user input updates one of the
* Synchronise column and row inputs, called every time a user input updates one of the
* two inputs by the SynchronizedInputs widget.
*/
ns.PngExportController.prototype.onColumnsInput_ = function () {
Expand Down
2 changes: 1 addition & 1 deletion src/js/database/PiskelDatabase.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
});
cursor.continue();
} else {
// Cursor consumed all availabled piskels
// Cursor consumed all available piskels
deferred.resolve(piskels);
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/js/service/keyboard/Shortcuts.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
ns.Shortcuts = {
/**
* List of keys that cannot be remapped. Either alternate keys, which are not displayed.
* Or really custom shortcuts such as the 1-9 for color palette shorctus
* Or really custom shortcuts such as the 1-9 for color palette shortcuts
*/
FORBIDDEN_KEYS : ['1', '2', '3', '4', '5', '6', '7', '8', '9', '?', 'shift+?',
'DEL', 'BACK', 'ENTER', 'ctrl+Y', 'ctrl+shift+Z'],
Expand Down
2 changes: 1 addition & 1 deletion src/js/tools/drawing/Move.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

/**
* The move tool id is used by the ToolController and the BaseSelect and needs to be
* easliy accessible
* easily accessible
*/
ns.Move.TOOL_ID = 'tool-move';

Expand Down
2 changes: 1 addition & 1 deletion src/js/tools/drawing/selection/BaseSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

/**
* If we mouseover the selection draw inside the overlay frame, show the 'move' cursor
* instead of the 'select' one. It indicates that we can move the selection by dragndroping it.
* instead of the 'select' one. It indicates that we can move the selection by dragndropping it.
* @override
*/
ns.BaseSelect.prototype.moveUnactiveToolAt = function(col, row, frame, overlay, event) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/utils/ResizeUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @param {Object} options
* - width {Number} target width after the resize
* - height {Number} target height after the resize
* - resizeContent {Booleam} true of the sprite content should be resized
* - resizeContent {Boolean} true of the sprite content should be resized
* - origin {String} should be a valid AnchorWidget origin
* @return {Piskel} The resized piskel
*/
Expand Down
2 changes: 1 addition & 1 deletion src/js/utils/serialization/Deserializer.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
};

/**
* Backward comptibility only. Create a chunk for layerData objects that only contain
* Backward compatibility only. Create a chunk for layerData objects that only contain
* an single base64PNG without chunk/layout information.
*/
ns.Deserializer.prototype.normalizeLayerData_ = function (layerData) {
Expand Down
4 changes: 2 additions & 2 deletions src/js/widgets/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

ns.Tabs.prototype.init = function (container) {
this.tabListEl = container.querySelector('.tab-list');
this.tabContentlEl = container.querySelector('.tab-content');
this.tabContentEl = container.querySelector('.tab-content');
pskl.utils.Event.addEventListener(this.tabListEl, 'click', this.onTabsClicked_, this);

var tab = pskl.UserSettings.get(this.settingsName);
Expand All @@ -37,7 +37,7 @@
this.currentController.destroy();
}

this.tabContentlEl.innerHTML = pskl.utils.Template.get(this.tabs[tabId].template);
this.tabContentEl.innerHTML = pskl.utils.Template.get(this.tabs[tabId].template);
this.currentController = new this.tabs[tabId].controller(pskl.app.piskelController, this.parentController);
this.currentController.init();
this.currentTab = tabId;
Expand Down
2 changes: 1 addition & 1 deletion src/js/widgets/Wizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
};

/**
* Transition to the step cirresponding to the provided step name.
* Transition to the step corresponding to the provided step name.
* Animation will be skipped if no current step is displayed.
*/
ns.Wizard.prototype.goTo = function (stepName) {
Expand Down
2 changes: 1 addition & 1 deletion test/js/selection/SelectionManagerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe("SelectionManager suite", function() {

console.log('[SelectionManager] ... cut out of bounds');
selectionManager.copy({ type: Events.CLIPBOARD_CUT }, createMockCopyEvent());
console.log('[SelectionManager] ... check last pixel of midle line was cut in the source frame');
console.log('[SelectionManager] ... check last pixel of middle line was cut in the source frame');
frameEqualsGrid(currentFrame, [
[B, R, T],
[R, B, T],
Expand Down
2 changes: 1 addition & 1 deletion test/js/service/BackupServiceTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ describe('BackupService test', function () {
it('calls create to backup', function (done) {
preparePiskelMocks(1, 'piskel_name', 'piskel_desc', 'piskel_hash', 'serialized');

// Set snashot date.
// Set snapshot date.
snapshotDate = 5;

// No snapshots currently saved.
Expand Down