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

Merge master into release for 1.10 release #13503

Merged
merged 160 commits into from
Jul 3, 2017
Merged
Changes from 1 commit
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
6ce6e8a
add a tab with default extensions to extension manager
zaggino Mar 2, 2017
7d54c14
implement getDefaultExtensionPath function
zaggino Mar 2, 2017
c06fe29
enable and disable default extensions through a preference
zaggino Mar 2, 2017
63ffc99
use the preference when attempting to load an extension
zaggino Mar 2, 2017
2d197fb
do not allow disabling/enabling of themes
zaggino Mar 2, 2017
3d58d8e
better way to handle themes
zaggino Mar 2, 2017
4d7aa16
Upgraded version to 1.10
saurabh95 Mar 16, 2017
fd03198
Merge pull request #13185 from adobe/saurabh95/VersionBump
swmitra Mar 16, 2017
0469c0c
Now search history is stored in preferences and user can go through t…
saurabh95 Mar 17, 2017
2511442
ALF Automation (#13179)
walfgithub Mar 20, 2017
84094f3
Fixed a minor issue
saurabh95 Mar 20, 2017
6ed4e91
Addresses issue where style and script tags (and their contents) did …
thehogfather Mar 20, 2017
aefd90f
Add no-unsafe-negation rule and upgrade grunt-eslint to 19.0.0
ficristo Mar 20, 2017
49640bd
Merge pull request #13199 from ficristo/no-unsafe-negation
zaggino Mar 20, 2017
7cdca9e
Merge pull request #13198 from thehogfather/thehogfather/issue-13165-…
zaggino Mar 20, 2017
6364893
Added a check of Untitled doc in _getNormalizedFilename and _getDenor…
saurabh95 Mar 21, 2017
aefa3ab
Merge pull request #13201 from adobe/saurabh95/TernWorkerNormalizeFil…
swmitra Mar 21, 2017
a70549e
Merge branch 'master' of https://github.com/adobe/brackets into saura…
saurabh95 Mar 22, 2017
2529210
ALF Automation (#13204)
walfgithub Mar 23, 2017
21dfae1
Replaced .border-radius with border-radius css in brackets_patterns_o…
parthsharma2 Mar 27, 2017
e1caef2
Merge pull request #13235 from parthsharma2/master
zaggino Mar 28, 2017
b99b4dd
Addressed review comments and also added tests
saurabh95 Mar 28, 2017
b81edcd
Add jsx language ID to supported languages for JavaScript code hints
justinrusso Mar 28, 2017
7af7bc8
Style code (cleanup)
justinrusso Mar 28, 2017
349a458
Merge pull request #13237 from adobe/saurabh95/SearchHistory
zaggino Mar 29, 2017
665128d
Add media queries to display search and filter below tabs
justinrusso Mar 29, 2017
6a4ec9c
Change padding to be consistent with other elements' padding
justinrusso Mar 29, 2017
7ba7ccc
Reset margin of filter dropdown and add top and bottom padding to div…
justinrusso Mar 29, 2017
b3957d0
Prevent media queries from overlapping
justinrusso Mar 29, 2017
f7632b7
Wrap search elements in a container & add responsiveness using flex
justinrusso Mar 29, 2017
4a52ce9
Use flex-item mixin
justinrusso Mar 29, 2017
106aed9
Move custom search bar width to media query
justinrusso Mar 29, 2017
fba7428
Merge pull request #13243 from justinrusso/feature/jsx_code_hints
zaggino Mar 30, 2017
f0a66d9
Merge pull request #13245 from justinrusso/bugfix/extension_manager_r…
zaggino Apr 3, 2017
bbdbec5
Add GitHub Brackets OAuth token to romove CLA pull request limit
swmitra Apr 4, 2017
749c1c2
Adding rest filter expression
swmitra Apr 4, 2017
28b59df
Merge pull request #13262 from adobe/swmitra/CLAFixOAuth
zaggino Apr 4, 2017
9dec5b8
Updated webplatform links in css.json from https://docs.webplatform.o…
saurabh95 Apr 5, 2017
1a5e835
Addresses #13264 where setting `saveFoldStates` preference to false c…
thehogfather Apr 5, 2017
73430b6
CSS code hints in 'style' attribute value context
swmitra Apr 5, 2017
2d317ed
Merge branch 'master' of https://github.com/adobe/brackets into theho…
thehogfather Apr 6, 2017
24e79f7
Append auth token only when available in travis environment (#13272)
swmitra Apr 6, 2017
0442881
#7276 Live Preview highlight customization (#12949)
Worie Apr 6, 2017
f9afa59
Merge pull request #13269 from thehogfather/thehogfather/issue-13264-…
lkcampbell Apr 7, 2017
9fa4b77
Fix font family name preference (#13279)
swmitra Apr 7, 2017
8e2891a
Update grunt-contrib-watch to 1.0.0 and clean a bit the task (#13215)
ficristo Apr 7, 2017
cf1c051
Scrapped QuickDocs data for css and html from MDN to css.json and htm…
saurabh95 Apr 7, 2017
fe3a965
Pre-release build for 1.10 (#13283)
saurabh95 Apr 7, 2017
97b4f0a
Fix #13274 - make Brackets margin/padding highlight work like Chrome …
Apr 9, 2017
0881dd0
Migrated missing Quick Docs Tests from PR #10036 (#13285)
saurabh95 Apr 9, 2017
7adf634
Add inputStyle preference (#13216)
ficristo Apr 9, 2017
e7ed43d
Add indentBlockComment preference. Support indent block comments on l…
ficristo Apr 1, 2017
66259dc
Whitespace removal
Apr 9, 2017
e690a96
AtRules, Pseudo elements and Pseudo selector code hints
swmitra Apr 10, 2017
53afc8b
Merge pull request #13288 from Worie/worie/13274-lp-highlight-transform
swmitra Apr 10, 2017
0c914ef
Revert "Fix #13274 - make Brackets margin/padding remoteHighlight wor…
swmitra Apr 10, 2017
aef78dd
Merge pull request #13296 from adobe/revert-13288-worie/13274-lp-high…
swmitra Apr 10, 2017
fe9237e
Fix highlighting elements with border and transform-origin property.
Apr 10, 2017
ad915c7
Merge branch 'master' into worie/13274-lp-highlight-transform
Worie Apr 10, 2017
79afc18
Adress review comments and restructure using different extensions
swmitra Apr 11, 2017
ab91035
Added Search History UI similar to Quick Open
saurabh95 Apr 11, 2017
9af4b83
Minor Change
saurabh95 Apr 11, 2017
f2831fd
Fixed some issues
saurabh95 Apr 11, 2017
79c2bfd
Check for useTabChar and correct a comment. Add some tests
ficristo Apr 11, 2017
375b730
Handle multiline attribute value and add UNIT test for element styles
swmitra Apr 12, 2017
86554a7
Search bar is visible after pressing arrow up and down keys
saurabh95 Apr 12, 2017
1e5d906
Added JSDocs and updated tests
saurabh95 Apr 12, 2017
bd293bf
Zero results are not highlighted red now
saurabh95 Apr 13, 2017
afd8042
Resolved Merge conflicts
saurabh95 Apr 13, 2017
387731b
Merge pull request #13270 from adobe/swmitra/StyleAttributeHints
zaggino Apr 13, 2017
ab724e7
Added dropdown icon to toggle search History
saurabh95 Apr 13, 2017
a01159a
Merge remote-tracking branch 'origin/master' into zaggino/disable-def…
zaggino Apr 13, 2017
d6cf7c0
fix the extension-manager-min-width variable
zaggino Apr 13, 2017
03ab9bb
Merge pull request #13136 from adobe/zaggino/disable-default-extensions
swmitra Apr 13, 2017
4df0985
Handle SCSS mode seperately
swmitra Apr 13, 2017
15588c2
Use a single preference
ficristo Apr 15, 2017
bd392a6
Add test for block comments
ficristo Apr 16, 2017
cd78916
Correct a test
ficristo Apr 16, 2017
dc9f3af
Check also if it is a line comment command
ficristo Apr 16, 2017
5ae77a4
Addresses #13282 which caused performance issues when navigating betw…
thehogfather Apr 16, 2017
a16d58e
removed unused variable
thehogfather Apr 16, 2017
e3401ab
Removed filtering in search dropdown
saurabh95 Apr 17, 2017
8a71b9f
Return 0 from _firstNotWs
ficristo Apr 20, 2017
12d583f
Changed url to access Japanese translated page (#13321)
Blackweda Apr 21, 2017
70901f2
Merge pull request #13297 from Worie/worie/13274-lp-highlight-transform
swmitra Apr 24, 2017
d4030b8
Merge pull request #13310 from thehogfather/thehogfather/issue-13282-…
swmitra Apr 24, 2017
c96633f
Update Codemirror to version 5.25.2
swmitra Apr 24, 2017
1dcef5a
Addressed review comments
saurabh95 Apr 24, 2017
43ab45d
Removed Lint error
saurabh95 Apr 24, 2017
c3ed438
Merge pull request #13302 from adobe/saurabh95/SearchHistoryUI
swmitra Apr 24, 2017
d82a2be
add: flow-root as value for display (#13334)
praveenpuglia Apr 24, 2017
9b03593
Merge pull request #13254 from ficristo/comments
redmunds Apr 24, 2017
5c8dcc0
Changed Global.js to enable Native Menus for Linux
saurabh95 Apr 25, 2017
6da0c76
Merge pull request #13331 from adobe/swmitra/CMUpdate
zaggino Apr 26, 2017
30ebdde
Merge branch 'master' of https://github.com/adobe/brackets into swmit…
swmitra Apr 26, 2017
60d97a9
Adding unit tests for the newly added extensions
swmitra Apr 26, 2017
7b4bdf4
Fix for eslint errors
swmitra Apr 26, 2017
03d1789
Extract pseudo context validation as a function
swmitra Apr 27, 2017
306b10e
Enabled tests for Native Menus in Linux
saurabh95 Apr 27, 2017
515fb5c
Merge pull request #13295 from adobe/swmitra/EnhancedCSSCodeHints
zaggino Apr 27, 2017
51e9e8c
Editor command handlers test (#13337)
ficristo Apr 27, 2017
e9640be
Now initial query is also added to searchHistory queue
saurabh95 Apr 28, 2017
fb39e3a
Update CSS Code Hints Properties
valtlai Apr 28, 2017
27ba7bb
Update CSS Code Hints pseudo-selectors
valtlai Apr 28, 2017
227b834
Update more
valtlai Apr 28, 2017
cd50b51
Added test
saurabh95 May 3, 2017
5562adc
Merge pull request #13339 from adobe/saurabh95/linux-native-menus
swmitra May 3, 2017
dc835d5
Merge pull request #13344 from valtlai/valtlai/css-props
swmitra May 3, 2017
80d97a4
Fix :matches(), add :fullscreen
valtlai May 3, 2017
bc4fb9f
Merge pull request #13345 from valtlai/valtlai/css-pseudo
swmitra May 3, 2017
52b08fc
Added check for length of dependencies also in npm-installer.js
saurabh95 May 4, 2017
23befa2
Translated English to Japanese Comments (#13327)
Blackweda May 4, 2017
ab73e2b
Change parseInt to parseFloat everywhere where calculating box-model …
Worie May 4, 2017
4aab9a7
Merge pull request #13352 from adobe/saurabh95/npm-installer-dependen…
zaggino May 4, 2017
c8c3add
Merge pull request #13342 from adobe/saurabh95/SearchHistory
zaggino May 5, 2017
886678e
Fixed Project Manager failing tests
saurabh95 May 9, 2017
792580f
Merge pull request #13368 from adobe/saurabh95/Fixed-ProjectManager-t…
swmitra May 10, 2017
0bad10f
Brackets 1.10 Pre-release 2
saurabh95 May 22, 2017
881b648
Fix box model regression (transform) (#13357)
Worie May 24, 2017
b1dc8c9
Various additions and changes to Swedish interface strings (#13404)
Jun 8, 2017
cdc71b9
Externalize Live preview hightlight settings string
saurabh95 Jun 12, 2017
baef037
ALF Automation (#13293)
walfgithub Jun 13, 2017
b9c5795
Merge pull request #13431 from adobe/saurabh95/ExternalizeString
swmitra Jun 13, 2017
ae015b5
Fix root strings (#13435)
Jun 13, 2017
3df3963
ALF Automation (#13434)
walfgithub Jun 14, 2017
f4dd55c
Change in UUID fetching for first launches (#13419)
nethip Jun 15, 2017
038bcb6
Add option for first highlight index in Quick Open and Search History…
saurabh95 Jun 15, 2017
ddf4da4
Changed WebPlatform License to MDN License and respective strings
saurabh95 Jun 15, 2017
7071276
Use the correct border color in multifile Replace in Files bar with d…
Jun 15, 2017
3e37cff
Merge pull request #13449 from adobe/marcel/replace-batch-border
swmitra Jun 16, 2017
9b7a4ee
Updated by ALF automation. (#13454)
walfgithub Jun 17, 2017
731177d
In writeJSON (grunt), use CRLF on Windows (#13458)
Jun 18, 2017
c98a019
Fixes translation error in Simplified Chinese
Jun 18, 2017
e704f75
Enable no-redeclare to eslint (#13452)
horiaradu Jun 18, 2017
783612a
Added strings for translation for 1.10 Release
saurabh95 Jun 19, 2017
7ec5591
minor change
saurabh95 Jun 19, 2017
93cb83f
Add navigation strings.
swmitra Jun 19, 2017
bc2e302
Updated some strings
swmitra Jun 19, 2017
4fc41ef
Merge pull request #13469 from adobe/saurabh95/1.10_Strings
swmitra Jun 19, 2017
3b4dc4b
ALF Automation (#13471)
walfgithub Jun 20, 2017
29cb293
Merge pull request #13463 from mjaseem/jaseemumar-patch-1
ficristo Jun 21, 2017
96d5493
Added some more translations
saurabh95 Jun 23, 2017
be28282
Merge pull request #13447 from adobe/saurabh95/MDNLicenseUpdate
swmitra Jun 23, 2017
48a58fe
Saurabh95/encoding support (#13412)
saurabh95 Jun 23, 2017
3aa8ef6
More Robust UUID Handling (#13476)
nethip Jun 23, 2017
8ecb5ed
Now BOM is preserved for UTF-8 files (#13477)
saurabh95 Jun 27, 2017
0cb4716
fix JP translation in comment tags (#13363)
ArturOledzki Jun 27, 2017
1b64b1e
New File and New Folder execute in project root if there's no selecti…
Jun 27, 2017
538402d
Polish translation update for brackets 1.10 (#13398)
karmatys Jun 27, 2017
940660e
German translation (#13436)
Jun 27, 2017
475dfc2
zh-cn (#13473)
Jun 27, 2017
7192b13
Problems panel: add an icon per problem to tell which type it is (#13…
ficristo Jun 28, 2017
9bb0bfb
Sequential navigation in edit history (#13418)
swmitra Jun 28, 2017
3548fc3
pre release build 3
swmitra Jun 28, 2017
57f778f
Fixed JS lint error (#13489)
saurabh95 Jun 28, 2017
2c943cd
Fix NavigationProvider throwing errors when doc.file is missing. Fixe…
petetnt Jun 28, 2017
3e47d04
ALF Automation (#13474)
walfgithub Jun 29, 2017
cfe7b59
Adding extra check to handle null mrof list entries (#13495)
swmitra Jun 29, 2017
6ac21ff
After changing encoding of a dirty file if user cancels the popup the…
saurabh95 Jun 30, 2017
ce77877
Merge branch 'release' into master
swmitra Jul 3, 2017
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
Prev Previous commit
Next Next commit
Now search history is stored in preferences and user can go through t…
…he search history using key up and key down in search bar
saurabh95 committed Mar 17, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 0469c0c66fc4b1fb36794b3ad07e7a70befb1a7d
1 change: 1 addition & 0 deletions src/nls/root/strings.js
Original file line number Diff line number Diff line change
@@ -152,6 +152,7 @@ define({
"FIND_MATCH_INDEX" : "{0} of {1}",
"FIND_NO_RESULTS" : "No results",
"FIND_QUERY_PLACEHOLDER" : "Find\u2026",
"FIND_HISTORY_MAX_COUNT" : "Maximum Number of Search Items in Search History",
"REPLACE_PLACEHOLDER" : "Replace with\u2026",
"BUTTON_REPLACE_ALL" : "Replace All",
"BUTTON_REPLACE_BATCH" : "Batch\u2026",
26 changes: 26 additions & 0 deletions src/search/FindBar.js
Original file line number Diff line number Diff line change
@@ -267,6 +267,7 @@ define(function (require, exports, module) {
FindBar._addFindBar(this);

var $root = this._modalBar.getRoot();
var currentIndex = 0;
$root
.on("input", "#find-what", function () {
self.trigger("queryChange");
@@ -310,9 +311,21 @@ define(function (require, exports, module) {
if (intervalId === 0) {
intervalId = window.setInterval(executeSearchIfNeeded, 50);
}
var searchHistory = PreferencesManager.getViewState("searchHistory");
var maxCount = PreferencesManager.get("maxSearchHistory");
if (e.keyCode === KeyEvent.DOM_VK_RETURN) {
e.preventDefault();
e.stopPropagation();
var searchQueryIndex = searchHistory.indexOf($('#find-what').val());
if (searchQueryIndex !== -1) {
searchHistory.splice(searchQueryIndex, 1);
} else {
if (searchHistory.length === maxCount) {
searchHistory.splice(maxCount - 1, 1);
}
}
searchHistory.unshift($('#find-what').val());
PreferencesManager.setViewState("searchHistory", searchHistory);
lastQueriedText = self.getQueryInfo().query;
if (self._options.multifile) {
if ($(e.target).is("#find-what")) {
@@ -333,6 +346,15 @@ define(function (require, exports, module) {
// if Shift is held down).
self.trigger("doFind", e.shiftKey);
}
currentIndex = 0;
} else if (e.keyCode === KeyEvent.DOM_VK_DOWN) {
currentIndex = (currentIndex + 1) % Math.min(maxCount, searchHistory.length);
$("#find-what").val(searchHistory[currentIndex]);
self.trigger("queryChange");
} else if (e.keyCode === KeyEvent.DOM_VK_UP) {
currentIndex = (currentIndex - 1 + maxCount) % Math.min(maxCount, searchHistory.length);
$("#find-what").val(searchHistory[currentIndex]);
self.trigger("queryChange");
}
});

@@ -616,6 +638,10 @@ define(function (require, exports, module) {

PreferencesManager.stateManager.definePreference("caseSensitive", "boolean", false);
PreferencesManager.stateManager.definePreference("regexp", "boolean", false);
PreferencesManager.stateManager.definePreference("searchHistory", "array", []);
PreferencesManager.definePreference("maxSearchHistory", "number", 10, {
description: Strings.FIND_HISTORY_MAX_COUNT
});

exports.FindBar = FindBar;
});