From 423511765a3d89a3b030f1aedd1026f017e1958b Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 14 Mar 2018 23:15:51 +0800 Subject: [PATCH] Fix typo --- CODING_GUIDELINES.md | 2 +- Changelog | 42 +++++++++---------- cmake/Modules/MacroLinkQtComponents.cmake | 2 +- src/app/stacktrace_win.h | 2 +- src/base/http/requestparser.cpp | 2 +- src/base/net/dnsupdater.cpp | 2 +- src/base/settingsstorage.cpp | 2 +- src/gui/mainwindow.cpp | 2 +- src/gui/search/searchtab.ui | 2 +- src/gui/statsdialog.cpp | 2 +- src/searchengine/nova/fix_encoding.py | 4 +- src/webui/www/private/scripts/client.js | 2 +- src/webui/www/private/scripts/contextmenu.js | 2 +- src/webui/www/private/scripts/dynamicTable.js | 2 +- .../private/scripts/excanvas-compressed.js | 6 +-- src/webui/www/private/scripts/mocha.js | 10 ++--- 16 files changed, 43 insertions(+), 43 deletions(-) diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md index bd05249f1..01169592a 100644 --- a/CODING_GUIDELINES.md +++ b/CODING_GUIDELINES.md @@ -210,7 +210,7 @@ class MyClass ### 8. Header inclusion order. ### The headers should be placed in the following order: 1. Module header (in .cpp) - 2. System/Qt/Boost etc. headers (splitted in subcategories if you have many). + 2. System/Qt/Boost etc. headers (split in subcategories if you have many). 3. Application headers, starting from *Base* headers. The headers should be ordered alphabetically within each group (subgroup).
diff --git a/Changelog b/Changelog index e65c1a689..d87eb72be 100644 --- a/Changelog +++ b/Changelog @@ -51,7 +51,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: Optimize code for SpeedWidget. (dzmat) - BUGFIX: Disable processing events when adding torrents(prevents crashes). Closes #7436. (Chocobo1) - BUGFIX: Open links in browser. Closes #7651. (Chocobo1) - - BUGFIX: Change default settings for tracker/tier announces to mimick μTorrent behavior. (sledgehammer999) + - BUGFIX: Change default settings for tracker/tier announces to mimic μTorrent behavior. (sledgehammer999) - BUGFIX: Explicitly set UPnP state on start-up. Closes #7338. (Chocobo1) - BUGFIX: Include/print caught signal in stackdump (Chocobo1) - COSMETIC: Trackerlist: Set text alignment of columns with numbers to the right (thalieht) @@ -182,7 +182,7 @@ Unreleased - sledgehammer999 - v4.1.0 - FEATURE: Use Ctrl+F to search torrents. Closes #5797. (Tim Delaney) - FEATURE: Transferlist: add hotkeys for double click and recheck selected torrents (thalieht) - FEATURE: Add hotkey for execution log tab, Trackerlist, Peerlist etc (thalieht) - - FEATURE: Seperate seeds from peers for DHT, PeX and LSD (thalieht) + - FEATURE: Separate seeds from peers for DHT, PeX and LSD (thalieht) - BUGFIX: Do not remove added files unconditionally. Closes #6248 (Eugene Shalygin) - BUGFIX: Ignore mouse wheel events in Advanced Settings. Closes #866. (Chocobo1) - BUGFIX: Add queue repair code. It should fix missing torrents after restarting. (Eugene Shalygin, nxd4) @@ -194,7 +194,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: TransferListWidget: keep columns width even if they are hidden on qBittorrent startup (unless something goes wrong) (thalieht) - BUGFIX: fix index overflow for torrents with invalid meta data or empty progress (Falco) - BUGFIX: Immediately update torrent_status after manipulating super seeding mode. Partially fixes #6072. (sledgehammer999) - - BUGFIX: Use case-insensitive comparsion for torrent content window. Closes #6327. (Chocobo1) + - BUGFIX: Use case-insensitive comparison for torrent content window. Closes #6327. (Chocobo1) - BUGFIX: Fixed sort order for datetime columns with empty values (closes #2988) (Vladimir Sinenko) - BUGFIX: Disable proxy in WebUI HTTP server. Closes #6349. (Eugene Shalygin) - COSMETIC: Use a disabled progressbar's palette for unselected files. (sledgehammer999) @@ -322,12 +322,12 @@ Unreleased - sledgehammer999 - v4.1.0 - FEATURE: Add option to automatically remove .torrent files upon adding (Eugene Shalygin) - FEATURE: Add option to bind directly to an IP instead of using a network Interface (Sjoerd van der Berg, sledgehammer999) - FEATURE: Detailed tooltips on the progress and availability bars in the General button of each torrent. (Eugene Shalygin) - - FEATURE: Let user able to specifiy a filter when choosing an IP filter file (Chocobo1) + - FEATURE: Let user able to specify a filter when choosing an IP filter file (Chocobo1) - FEATURE: Improve usability of "Run External Program". Users can write (platform dependent) shell scripts now. (Chocobo1) - PERFORMANCE: Optimize drawing in speed graph (Anton Lashkov, Chocobo1) - BUGFIX: Fix memory leak. (sledgehammer999) - BUGFIX: Fix resizing bug in "add torrent dialog". Closes #5036. (Chocobo1) - - BUGFIX: Fix qBittorrent doesn't exit immediately when "all donwloads are done -> exit" option enabled. (glassez, Chocobo1) + - BUGFIX: Fix qBittorrent doesn't exit immediately when "all downloads are done -> exit" option enabled. (glassez, Chocobo1) - BUGFIX: Display the filepath when a torrent fails to load. Closes #100 and #805. (sledgehammer999) - BUGFIX: Fix Add tracker dialog empty trackers (ngosang) - BUGFIX: Fix Add tracker dialog URL download (ngosang) @@ -380,7 +380,7 @@ Unreleased - sledgehammer999 - v4.1.0 - OTHER: Enable access to shutdown functions when configured with `--disable-gui` option (Chocobo1) - OTHER: Delete Import Torrent Dialog. Just use the "add new torrent" dialog. (glassez) - OTHER: Optimize code for natural sorting (Chocobo1) - - OTHER: Use new alert dispathing API for libtorrent 1.1.x (glassez) + - OTHER: Use new alert dispatching API for libtorrent 1.1.x (glassez) - OTHER: Fix gcc 6 compilation with qmake. See #5237. (sledgehammer999) * Tue Mar 29 2016 - sledgehammer999 - v3.3.4 @@ -704,7 +704,7 @@ Unreleased - sledgehammer999 - v4.1.0 - SEARCH: Fix thepiratebay. Closes #3012 (ngosang) - SEARCH: Improve torrentz engine to return more results (ngosang) - SEARCH: Change width of columns in search tab. Closes #764 (ngosang) - - SEARCH: Make strings translatable in seach engine (ngosang) + - SEARCH: Make strings translatable in search engine (ngosang) - SEARCH: Aborting search engine process during closure. Close #2671 (DoumanAsh) - SEARCH: Perform searches in parallel (DoumanAsh) - SEARCH: Add Demonoid search engine (ngosang) @@ -871,7 +871,7 @@ Unreleased - sledgehammer999 - v4.1.0 - WEBUI: Removed broken 'Documentation'. Improves fix for #1343 (Benjamin Hutchins) - WEBUI: Removed essentially useless 'Visit website' iframe and changed it to a regular link. Improves fix for #1343 (Benjamin Hutchins) - BUGFIX: Fix RSS feed icon. The tmp file gets deleted in the feed destructor. Closes #1639 (sledgehammer999) - - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "dont ask me again" is set (Ivan Sorokin) + - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "don't ask me again" is set (Ivan Sorokin) - BUGFIX: Don't show availability bar for magnet links (Ivan Sorokin) - BUGFIX: Fix crash when the selected torrent disappears from the transfer list. Closes #1661 (sledgehammer999) - BUGFIX: Fix tracker announcing problem(hit-and-run) when many torrents are being active. Closes #1571 (sledgehammer999) @@ -1005,7 +1005,7 @@ Unreleased - sledgehammer999 - v4.1.0 - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999) - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999) - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999) - - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999) + - FEATURE: Re-enable "force reannounce" to all trackers. (sledgehammer999) - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999) - FEATURE: New translations: English(Australia) and English(United Kingdom) - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999) @@ -1054,8 +1054,8 @@ Unreleased - sledgehammer999 - v4.1.0 - OTHER: Make peer tab sortable by ip too (Gelmir) - OTHER: Translations moved to Transifex(https://www.transifex.com/projects/p/qbittorrent/) - OTHER: New Translation - Vietnamese (Anh Phan) - - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) - - PERFORMANCE: Impove drawing speed of peers list when there are many peers + - PERFORMANCE: Improve drawing speed of tranferlist when there are many torrents(>100) + - PERFORMANCE: Improve drawing speed of peers list when there are many peers * Mon Jul 29 2013 - sledgehammer999 - v3.0.11 - FEATURE: Allow more fine tuning of upload slots. It should improve speed (sledgehammer999) @@ -1095,8 +1095,8 @@ Unreleased - sledgehammer999 - v4.1.0 - LIBTORRENT: SOCKS5 fixes (0.16.10) - LIBTORRENT: Fix hanging issue on Windows when closing files (0.16.10) - LIBTORRENT: Cache can now be returned to the OS (0.16.10) - - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999) - - PERFORMANCE: Impove drawing speed of peers list when there are many peers (sledgehammer999) + - PERFORMANCE: Improve drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999) + - PERFORMANCE: Improve drawing speed of peers list when there are many peers (sledgehammer999) * Sat Mar 16 2013 - Christophe Dumez - v3.0.9 - BUGFIX: Raise qBittorrent windows when another instance is launched @@ -1120,7 +1120,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: Fix "Couldn't set environment variable..." message on start up (closes #245) - BUGFIX: Use right path separator in torrent addition dialog on Windows - BUGFIX: Fix "Set as default save path" setting (closes #254) - - BUGFIX: Reenable disk cache on Windows since the memory issue seems to be gone + - BUGFIX: Re-enable disk cache on Windows since the memory issue seems to be gone - BUGFIX: Fixed several search engine plugins and removed the dead ones - BUGFIX: Use https links in search plugins when possible - BUGFIX: Bump Mootools to v1.4.5 (Web UI) @@ -1256,7 +1256,7 @@ Unreleased - sledgehammer999 - v4.1.0 - I18N: Add Georgian translation * Sat Oct 29 2011 - Christophe Dumez - v2.9.2 - - BUGFIX: Fix mimimum dimensions for torrent addition dialog + - BUGFIX: Fix minimum dimensions for torrent addition dialog - BUGFIX: Remove dependency on boost-datetime - BUGFIX: Remove dependency on boost-filesystem (libtorrent v0.16.x) @@ -1467,7 +1467,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: Update RSS feed as soon as feed downloader is enabled - BUGFIX: RSS Feed downloader ignores articles above maximum number of articles - BUGFIX: Fix possible bug when deleting a RSS folder - - BUGFIX: Remove persistant data when a RSS feed is deleted + - BUGFIX: Remove persistent data when a RSS feed is deleted - BUGFIX: RSS filters are now alphabetically sorted - BUGFIX: Fix crash when renaming currently displayed RSS filter - BUGFIX: Remove overwriting confirmation when exporting RSS filters since Qt takes care of it @@ -1503,7 +1503,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: Use the save path set in program preferences as a default in torrent addition dialog * Fri Dec 18 2009 - Christophe Dumez - v2.0.2 - - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusuable for new users) + - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusable for new users) - BUGFIX: Fix RSS Feed downloader for some feeds - BUGFIX: Do not use home folder as a fallback when the save path is not accessible - BUGFIX: Fix Mininova, ThePirateBay search engine plugins @@ -1593,7 +1593,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: Fix trackers addition to torrents (bug introduced in v1.5.4) - BUGFIX: Suppress compilation warning regarding sortNewsList() not being used - BUGFIX: Make sure scan folder is different than qBittorrent backup directory to avoid torrents deletion - - BUGFIX: Added safety mecanism which adds the torrents back to the list in case qbittorrent-resume.conf gets deleted or corrupted. + - BUGFIX: Added safety mechanism which adds the torrents back to the list in case qbittorrent-resume.conf gets deleted or corrupted. * Sun Oct 25 2009 - Christophe Dumez - v1.5.4 - BUGFIX: Updated man page @@ -1660,7 +1660,7 @@ Unreleased - sledgehammer999 - v4.1.0 - FEATURE: Added right click menu in search engine to clear completion history - FEATURE: Allow to set a different port for DHT (UDP) than the one used for Bittorrent - FEATURE: Updated spoofing code to avoid trackers ban - - BUGFIX: Provide more helpful explanation when an I/O error occured + - BUGFIX: Provide more helpful explanation when an I/O error occurred - BUGFIX: Stop enforcing UTF-8 and use system locale instead - COSMETIC: Redesigned program preferences - COSMETIC: Updated icons set @@ -1678,7 +1678,7 @@ Unreleased - sledgehammer999 - v4.1.0 - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog - BUGFIX: Fixed a little bug in search engine plugins helper file - BUGFIX: Fixed compilation problems with Qt 4.3 - - BUGFIX: Percentages no longer disapear with default cleanlooks style + - BUGFIX: Percentages no longer disappear with default cleanlooks style - BUGFIX: Cleanly fixed popup menus position in lists (no more workarounds) - BUGFIX: Fixed memory leak in search engine - BUGFIX: Torrents with an infinite ratio are no longer affected by ratio_limit set in program preferences @@ -1923,7 +1923,7 @@ Unreleased - sledgehammer999 - v4.1.0 - FEATURE: Number of complete/incomplete sources are now displayed in download list for each torrent - FEATURE: Implemented close to systray - FEATURE: Added Autocompletion to search engine - - FEATURE: Splitted BT & GUI parts (huge code rewriting & optimization) + - FEATURE: Split BT & GUI parts (huge code rewriting & optimization) - FEATURE: New parameters for configure file to point to custom locations for libtorrent/libcurl - FEATURE: Update application style according to the system (WindowsXP, MacOS, X11) - BUGFIX: Two torrents can now have the same name although they are different (use their hash) diff --git a/cmake/Modules/MacroLinkQtComponents.cmake b/cmake/Modules/MacroLinkQtComponents.cmake index c8a1c941f..931b78abc 100644 --- a/cmake/Modules/MacroLinkQtComponents.cmake +++ b/cmake/Modules/MacroLinkQtComponents.cmake @@ -1,5 +1,5 @@ # - macro similar to target_link_libraries, which links Qt components -# names of the components are pased in Qt4/Qt5 agnostic way (Core, DBus, Xml...) +# names of the components are passed in Qt4/Qt5 agnostic way (Core, DBus, Xml...) # and the macro links Qt4 ones if QT4_FOUND is set or Qt5 ones if not macro (target_link_qt_components target) diff --git a/src/app/stacktrace_win.h b/src/app/stacktrace_win.h index ca86ebd9d..0ed005b27 100644 --- a/src/app/stacktrace_win.h +++ b/src/app/stacktrace_win.h @@ -291,7 +291,7 @@ const QString straceWin::getBacktrace() demangle(funcName); #endif - // now ihsf.InstructionOffset points to the instruction that follows CALL instuction + // now ihsf.InstructionOffset points to the instruction that follows CALL instruction // decrease the query address by one byte to point somewhere in the CALL instruction byte sequence sourceFile = getSourcePathAndLineNumber(hProcess, ihsf.InstructionOffset - 1); } diff --git a/src/base/http/requestparser.cpp b/src/base/http/requestparser.cpp index e7de473d2..95f4bca2a 100644 --- a/src/base/http/requestparser.cpp +++ b/src/base/http/requestparser.cpp @@ -223,7 +223,7 @@ bool RequestParser::parsePostMessage(const QByteArray &data) const QByteArray delimiter = Utils::String::unquote(contentType.midRef(idx + boundaryFieldName.size())).toLatin1(); if (delimiter.isEmpty()) { - qWarning() << Q_FUNC_INFO << "boundary delimiter field emtpy!"; + qWarning() << Q_FUNC_INFO << "boundary delimiter field empty!"; return false; } diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp index 23e9ca579..621980b65 100644 --- a/src/base/net/dnsupdater.cpp +++ b/src/base/net/dnsupdater.cpp @@ -196,7 +196,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply) return; } - // Everything bellow is an error, stop updating until the user updates something + // Everything below is an error, stop updating until the user updates something m_ipCheckTimer.stop(); m_lastIP.clear(); if (code == "nohost") { diff --git a/src/base/settingsstorage.cpp b/src/base/settingsstorage.cpp index e7323c2ef..a4c6aa8fb 100644 --- a/src/base/settingsstorage.cpp +++ b/src/base/settingsstorage.cpp @@ -238,7 +238,7 @@ QVariantHash TransactionalSettings::read() QString newPath = deserialize(m_name + QLatin1String("_new"), res); if (!newPath.isEmpty()) { // "_new" file is NOT empty // This means that the PC closed either due to power outage - // or because the disk was full. In any case the settings weren't transfered + // or because the disk was full. In any case the settings weren't transferred // in their final position. So assume that qbittorrent_new.ini/qbittorrent_new.conf // contains the most recent settings. Logger::instance()->addMessage(QObject::tr("Detected unclean program exit. Using fallback file to restore settings."), Log::WARNING); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 6eafd5416..a5daa6a15 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1516,7 +1516,7 @@ void MainWindow::updateGUI() { const BitTorrent::SessionStatus &status = BitTorrent::Session::instance()->status(); - // update global informations + // update global information #ifndef Q_OS_MAC if (m_systrayIcon) { #ifdef Q_OS_UNIX diff --git a/src/gui/search/searchtab.ui b/src/gui/search/searchtab.ui index d2ec133d6..2c0e75a34 100644 --- a/src/gui/search/searchtab.ui +++ b/src/gui/search/searchtab.ui @@ -52,7 +52,7 @@ - <html><head/><body><p>Some search engines search in torrent description and in torrent file names too. Whether such results will be shown in the list below is controlled by this mode.</p><p><span style=" font-weight:600;">Everywhere </span>disables filtering and shows everyhing returned by the search engines.</p><p><span style=" font-weight:600;">Torrent names only</span> shows only torrents whose names match the search query.</p></body></html> + <html><head/><body><p>Some search engines search in torrent description and in torrent file names too. Whether such results will be shown in the list below is controlled by this mode.</p><p><span style=" font-weight:600;">Everywhere </span>disables filtering and shows everything returned by the search engines.</p><p><span style=" font-weight:600;">Torrent names only</span> shows only torrents whose names match the search query.</p></body></html> diff --git a/src/gui/statsdialog.cpp b/src/gui/statsdialog.cpp index 15aea6a69..f02f5aa90 100644 --- a/src/gui/statsdialog.cpp +++ b/src/gui/statsdialog.cpp @@ -63,7 +63,7 @@ void StatsDialog::update() const BitTorrent::SessionStatus &ss = BitTorrent::Session::instance()->status(); const BitTorrent::CacheStatus &cs = BitTorrent::Session::instance()->cacheStatus(); - // Alltime DL/UL + // All-time DL/UL quint64 atd = BitTorrent::Session::instance()->getAlltimeDL(); quint64 atu = BitTorrent::Session::instance()->getAlltimeUL(); m_ui->labelAlltimeDL->setText(Utils::Misc::friendlyUnit(atd)); diff --git a/src/searchengine/nova/fix_encoding.py b/src/searchengine/nova/fix_encoding.py index 61bd742b4..7cea2da90 100644 --- a/src/searchengine/nova/fix_encoding.py +++ b/src/searchengine/nova/fix_encoding.py @@ -239,7 +239,7 @@ class WinUnicodeOutput(WinUnicodeOutputBase): """Output adaptor to a file output on Windows. If the standard FileWrite function is used, it will be encoded in the current - code page. WriteConsoleW() permits writting any character. + code page. WriteConsoleW() permits writing any character. """ def __init__(self, stream, fileno, encoding): super(WinUnicodeOutput, self).__init__( @@ -356,7 +356,7 @@ def fix_win_console(encoding): def fix_encoding(): """Fixes various encoding problems on all platforms. - Should be called at the very begining of the process. + Should be called at the very beginning of the process. """ ret = True if sys.platform == 'win32': diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js index 06a80459e..78d5eb2ab 100644 --- a/src/webui/www/private/scripts/client.js +++ b/src/webui/www/private/scripts/client.js @@ -344,7 +344,7 @@ window.addEvent('load', function () { response['torrents_removed'].each(function (hash) { torrentsTable.removeRow(hash); removeTorrentFromCategoryList(hash); - update_categories = true; // Allways to update All category + update_categories = true; // Always to update All category }); torrentsTable.updateTable(full_update); torrentsTable.altRow(); diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js index f8f559f61..153675354 100644 --- a/src/webui/www/private/scripts/contextmenu.js +++ b/src/webui/www/private/scripts/contextmenu.js @@ -62,7 +62,7 @@ var ContextMenu = new Class({ if (this.menu.hasClass('scrollableMenu')) this.menu.setStyle('max-height', scrollableMenuMaxHeight); - // draw the menu off-screen to know the menu dimentions + // draw the menu off-screen to know the menu dimensions this.menu.setStyles({ left: '-999em', top: '-999em' diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index 7798c00b9..2da1be28d 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -26,7 +26,7 @@ Script : Dynamic Table Version : 0.5 Authors : Ishan Arora & Christophe Dumez - Desc : Programable sortable table + Desc : Programmable sortable table Licence : Open Source MIT Licence **************************************************************/ diff --git a/src/webui/www/private/scripts/excanvas-compressed.js b/src/webui/www/private/scripts/excanvas-compressed.js index 1d9ddb266..51fb0ec0f 100644 --- a/src/webui/www/private/scripts/excanvas-compressed.js +++ b/src/webui/www/private/scripts/excanvas-compressed.js @@ -49,7 +49,7 @@ if (!document.createElement('canvas').getContext) { var Z2 = Z / 2; /** - * This funtion is assigned to the elements as element.getContext(). + * This function is assigned to the elements as element.getContext(). * @this {HTMLElement} * @return {CanvasRenderingContext2D_} */ @@ -469,7 +469,7 @@ if (!document.createElement('canvas').getContext) { contextPrototype.drawImage = function(image, var_args) { var dx, dy, dw, dh, sx, sy, sw, sh; - // to find the original width we overide the width and height + // to find the original width we override the width and height var oldRuntimeWidth = image.runtimeStyle.width; var oldRuntimeHeight = image.runtimeStyle.height; image.runtimeStyle.width = 'auto'; @@ -479,7 +479,7 @@ if (!document.createElement('canvas').getContext) { var w = image.width; var h = image.height; - // and remove overides + // and remove overrides image.runtimeStyle.width = oldRuntimeWidth; image.runtimeStyle.height = oldRuntimeHeight; diff --git a/src/webui/www/private/scripts/mocha.js b/src/webui/www/private/scripts/mocha.js index daef7e552..279c57b07 100644 --- a/src/webui/www/private/scripts/mocha.js +++ b/src/webui/www/private/scripts/mocha.js @@ -65,7 +65,7 @@ MUI.extend({ updateOptions: element - The parent window or panel. - childElement - The child element of the window or panel recieving the content. + childElement - The child element of the window or panel receiving the content. method - ('get', or 'post') The way data is transmitted. data - (hash) Data to be transmitted title - (string) Change this if you want to change the title of the window or panel. @@ -1891,7 +1891,7 @@ MUI.Window = new Class({ setupEvents: function() { var windowEl = this.windowEl; // Set events - // Note: if a button does not exist, its due to properties passed to newWindow() stating otherwice + // Note: if a button does not exist, its due to properties passed to newWindow() stating otherwise if (this.closeButtonEl){ this.closeButtonEl.addEvent('click', function(e) { new Event(e).stop(); @@ -3646,7 +3646,7 @@ MUI.extend({ /* Internal Function: dynamicResize - Use with a timer to resize a window as the window's content size changes, such as with an accordian. + Use with a timer to resize a window as the window's content size changes, such as with an accordion. */ dynamicResize: function(windowEl){ @@ -3908,7 +3908,7 @@ MUI.files[MUI.path.source + 'Window/Arrange-cascade.js'] = 'loaded'; MUI.extend({ arrangeCascade: function(){ - var viewportTopOffset = 30; // Use a negative number if neccessary to place first window where you want it + var viewportTopOffset = 30; // Use a negative number if necessary to place first window where you want it var viewportLeftOffset = 20; var windowTopOffset = 50; // Initial vertical spacing of each window var windowLeftOffset = 40; @@ -3993,7 +3993,7 @@ MUI.files[MUI.path.source + 'Window/Arrange-tile.js'] = 'loaded'; MUI.extend({ arrangeTile: function(){ - var viewportTopOffset = 30; // Use a negative number if neccessary to place first window where you want it + var viewportTopOffset = 30; // Use a negative number if necessary to place first window where you want it var viewportLeftOffset = 20; var x = 10;