Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Themes in Core v1 #8302

Merged
merged 109 commits into from
Jul 14, 2014
Merged
Changes from 1 commit
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
d12d87b
Initial commit to integrate themes into brackets core
MiguelCastillo Apr 24, 2014
657df85
Delete stale Init.js file
MiguelCastillo Apr 24, 2014
5cb4085
Cleaned up jslint errors/warnings
MiguelCastillo Apr 24, 2014
abf3e49
Removed string.js. Not needed anymore
MiguelCastillo Apr 24, 2014
5473380
Removed custom themes from the themes extension
MiguelCastillo Apr 24, 2014
a1dea7e
Cleaned up extra white spaces
MiguelCastillo Apr 24, 2014
6f1df7a
Adjusted comments to follow convention
MiguelCastillo Apr 24, 2014
361d715
Adding CMD_THEMES to nls strings.js
MiguelCastillo Apr 24, 2014
7a8997f
Checking support to load themes as extensions
MiguelCastillo Apr 26, 2014
2856006
Refactored ExtensionLoader so that it can preload package.json
MiguelCastillo Apr 26, 2014
b0df2fc
Removed logic to load CodeMirror themes automatically
MiguelCastillo Apr 26, 2014
1c64c1a
themes settings css and html files to their styles and htmlContent co…
MiguelCastillo Apr 27, 2014
a572d22
Renames settings.js to settingsmanager.js
MiguelCastillo Apr 27, 2014
e68c3ec
Moved views/settings to ThemeSettingsDialog
MiguelCastillo Apr 27, 2014
43b5abb
Removed paths from settings. That's ole stuff from themes extension
MiguelCastillo Apr 27, 2014
92ac359
Changed (void 0) checks to undefined.
MiguelCastillo Apr 27, 2014
fb54d2f
Merge remote-tracking branch 'upstream/master'
MiguelCastillo Apr 27, 2014
bc7054f
Removed obsolete files
MiguelCastillo Apr 27, 2014
767c9e5
Change exports.THEMES to exports.CMD_THEMES_SETTINGS_OPEN
MiguelCastillo Apr 27, 2014
5c6f83b
Renamed view export from CMD_THEMES_SETTINGS_OPEN to CMD_THEMES_OPEN_…
MiguelCastillo Apr 27, 2014
d83bf29
Removing license file as its no longer needed due to CLA
MiguelCastillo May 6, 2014
0854441
Enabling the use of the package title to be the primary source of the…
MiguelCastillo May 7, 2014
f9d29db
Big refactor to make use of definePreference and rely on its change e…
MiguelCastillo May 7, 2014
d55254f
Reading text files with FileUtils.readAsText
MiguelCastillo May 8, 2014
f686926
Change to use FileUtils.getFileExtension
MiguelCastillo May 8, 2014
02515b1
Exposing theme change event and loadDirectory interface
MiguelCastillo May 8, 2014
e037fc0
Moved CodeMirrorAddons from themes to a global module that brackets uses
MiguelCastillo May 8, 2014
8ee527b
Removed loadList to clean up the code a bit. Also renamed ThemeFiles…
MiguelCastillo May 8, 2014
fe05d09
Fixed issue with selected theme not properly getting select in the se…
MiguelCastillo May 8, 2014
f8eac83
Setting themes up so that it can support mixing themes if we were to …
MiguelCastillo May 8, 2014
1ba4ac0
Added logic to handle correctly setting selected state when selecting…
MiguelCastillo May 8, 2014
5bd2d89
Removed mark-selection add-on. Will add this in a different PR. Als…
MiguelCastillo May 9, 2014
e46a93d
Removed require CodeMirror as its no longer needed
MiguelCastillo May 9, 2014
b2d0702
Merge remote-tracking branch 'upstream/master'
MiguelCastillo May 9, 2014
768d2f0
Added I18 string support to the dialog
MiguelCastillo May 9, 2014
2c74247
Corrected comment and some formatting in string.js
MiguelCastillo May 9, 2014
a1f6c6a
Merge remote-tracking branch 'upstream/master'
MiguelCastillo May 16, 2014
bce17ad
Merge remote-tracking branch 'upstream/master'
MiguelCastillo May 23, 2014
9832add
Major rewrite to move code around to be more inline with Brackets cor…
MiguelCastillo May 29, 2014
6cf0eae
Merge remote-tracking branch 'upstream/master'
MiguelCastillo May 29, 2014
803c26f
Fixed issue with unnecessary reload of themes when opening a new docu…
MiguelCastillo May 29, 2014
fc498a8
Chages to remove extra white spaces in expressions to follow Brackets…
MiguelCastillo May 29, 2014
796322a
Merge general settings and theme settings because there is only one t…
MiguelCastillo May 29, 2014
2f94472
Another style change
MiguelCastillo May 29, 2014
ff3c065
Moving code mirror add ons back to brackets.js
MiguelCastillo May 29, 2014
ab93c01
Moved Theme to ThemeManager
MiguelCastillo May 31, 2014
1d81228
Corrected issue with documents not getting properly styles with a theme
MiguelCastillo Jun 1, 2014
8d94e86
Removed force reload when appReady is resolved
MiguelCastillo Jun 1, 2014
7834318
Refactored ThemeManager to merge several functions to make the code a…
MiguelCastillo Jun 1, 2014
280c83e
Added documentation to ThemeManager.js
MiguelCastillo Jun 2, 2014
72f6354
Adding comment I mistakenly changed
MiguelCastillo Jun 3, 2014
43ed137
Fixed issue where themes that no longer existed would cause the theme…
MiguelCastillo Jun 5, 2014
1c05805
Removed temp code to load all code mirror themes
MiguelCastillo Jun 5, 2014
ea1aab0
Fixed issue with theme not being applied when set while no documents …
MiguelCastillo Jun 5, 2014
1416cd9
Remove old css file to avoid weird flashes when saving a theme
MiguelCastillo Jun 5, 2014
8bfd51e
Adjusted code mirror override to allow for themes to override the def…
MiguelCastillo Jun 5, 2014
ef8b5cd
Adding initial default themes. Thor Dark and Thor Light
MiguelCastillo Jun 6, 2014
2c06fd2
Added importance to make sure cursor is visible when it is on the lef…
MiguelCastillo Jun 6, 2014
c38e68d
Merge remote-tracking branch 'upstream/master'
MiguelCastillo Jun 6, 2014
79f7350
Merge remote-tracking branch 'upstream/master'
MiguelCastillo Jun 7, 2014
aebe379
Removed stale general.html file
MiguelCastillo Jun 7, 2014
8cef24a
Fixed issues in CM override less file that's breaking the build
MiguelCastillo Jun 7, 2014
710d4e0
Fixed issue where themes aren't properly reloaded when modified
MiguelCastillo Jun 7, 2014
9894c0e
Removed leftover console.log statement
MiguelCastillo Jun 7, 2014
72f5f34
Fixed issue with document types not properly cleaned up from the DOM.…
MiguelCastillo Jun 7, 2014
57df196
Reverted back tune up changes in codemirror-override. Will do anothe…
MiguelCastillo Jun 8, 2014
7f5a33c
Added rootpath to handle imports defined in styles/brackets*.less fil…
MiguelCastillo Jun 8, 2014
d71bbcb
Tweaked darkt theme and removed #status-overwrite text color that int…
Jun 8, 2014
cdfa4be
Using default Brackets theme as default light theme.
Jun 8, 2014
1491ad3
More dark theme tweaks.
Jun 8, 2014
9188e5c
Merge pull request #1 from MiguelCastillo/larz/theme-tweaks
MiguelCastillo Jun 8, 2014
22fc569
Removed extra call the get promise object. Redundant.
MiguelCastillo Jun 17, 2014
67abe19
Removed stale dependency
MiguelCastillo Jun 20, 2014
e14f151
Added a default to be loaded when the current theme isn't available. …
MiguelCastillo Jun 20, 2014
d302434
Merge remote-tracking branch 'upstream/master'
MiguelCastillo Jun 20, 2014
31cb2a6
Export reset settings interface and set the default theme to thor-lig…
MiguelCastillo Jun 20, 2014
b6a7ef3
Changed loop for iterating through new settings. Feedback from Kevin
MiguelCastillo Jun 20, 2014
86f78eb
Cleaned up a bit of the logic for selecting themes in the event handl…
MiguelCastillo Jun 20, 2014
a102a51
Cleaned up some of the comments and stale variables
MiguelCastillo Jun 20, 2014
0ce29ce
Merge remote-tracking branch 'upstream/master'
MiguelCastillo Jun 27, 2014
c2d26f2
Removing extra promise call
MiguelCastillo Jun 27, 2014
e8695be
Merge branch 'themes-master' into themes-v1
MiguelCastillo Jul 3, 2014
f9eb8b4
Iterating through all default properties when reading values instead …
MiguelCastillo Jul 3, 2014
a66ba6e
Renamed variable for better legibility and added comments where needed
MiguelCastillo Jul 3, 2014
4eb71f1
Renamed references of fontType to fontFamily in preparation for the f…
MiguelCastillo Jul 3, 2014
f5c71e8
Refactored initialization of themes to simplify some of the initializ…
MiguelCastillo Jul 4, 2014
8f019c5
Fixed issue when creating theme display names when titles in the pack…
MiguelCastillo Jul 4, 2014
d92152f
Marking defaults and setThemes as private functions
MiguelCastillo Jul 8, 2014
43d2628
Moved brackets_theme_settings.css to brackets.less
MiguelCastillo Jul 9, 2014
b3f1ece
Adding unit tests for themes core functionality
MiguelCastillo Jul 9, 2014
1b75f82
Moved around the settings template variable definition
MiguelCastillo Jul 9, 2014
dba9b0b
Corrected jsdoc to use $.Promise rather than $.Deferred
MiguelCastillo Jul 9, 2014
e2e7c86
Corrected jsdoc parameter to be options rather than displayName
MiguelCastillo Jul 9, 2014
ba3223e
Refactored the logic for making all first letters in each word upper …
MiguelCastillo Jul 9, 2014
0e68397
Merge branch 'newmaster' into themes-v1
MiguelCastillo Jul 9, 2014
aa13d46
Adding more unit tests around extract scrollbars routine
MiguelCastillo Jul 9, 2014
c8576b1
Added a couple more checks in unit tests for extract scrollbars
MiguelCastillo Jul 9, 2014
c96b710
Corrected JSLint reported issues
MiguelCastillo Jul 9, 2014
a298a95
Adding full MIT license clauses
MiguelCastillo Jul 9, 2014
9c1fa74
Added interface to retrieve all loaded themes that have been loaded
MiguelCastillo Jul 9, 2014
59944e3
Corrected jslint complain of missing space
MiguelCastillo Jul 9, 2014
53e5324
Added jsdoc return description
MiguelCastillo Jul 9, 2014
d6ed176
Corrected regression due to new logic to include the file extension a…
MiguelCastillo Jul 9, 2014
8156a38
Adding a more specific rule for line height to avoid line height not …
MiguelCastillo Jul 9, 2014
14de473
Make the line height rule a little more relaxed so that it does not m…
MiguelCastillo Jul 9, 2014
4c62a69
Merge branch 'newmaster' into themes-v1
MiguelCastillo Jul 9, 2014
208eb49
Removed em from line height
MiguelCastillo Jul 9, 2014
11d2c9b
Adjusted the logic for creating internal themes names when one isn't …
MiguelCastillo Jul 11, 2014
bef48a6
Adding fix to lower case windows driver letters so that the less proc…
MiguelCastillo Jul 11, 2014
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
14 changes: 7 additions & 7 deletions src/themes/ThemeFiles.js
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@
define(function(require) {
"use strict";


var FileSystem = require("filesystem/FileSystem");
var FileSystem = require("filesystem/FileSystem"),
FileUtils = require("file/FileUtils");

// Root directory for CodeMirror themes
var validExtensions = ["css", "less"];
@@ -36,7 +36,7 @@ define(function(require) {
entries = entries || [];

for (i = 0; i < entries.length; i++) {
if (entries[i].isFile && validExtensions.indexOf(getExtension(entries[i].name)) !== -1) {
if (isValid(entries[i])) {
files.push(entries[i].name);
}
}
@@ -74,13 +74,13 @@ define(function(require) {
}
}

return $.when.apply((void 0), directories).promise();
return $.when.apply(undefined, directories).promise();
}


function getExtension(file) {
var lastIndexOf = file.lastIndexOf(".") + 1;
return file.substr(lastIndexOf);
function isValid(file) {
return file.isFile &&
validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
}