: null
}
+ {
+ checkDefaultBrowserDialogIsVisible
+ ?
{
diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index 0499a44f83..733f9412b3 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -122,31 +122,26 @@ class NavigationBar extends ImmutableComponent {
originalDetail={this.props.bookmarkDetail.get('originalDetail')}
destinationDetail={this.props.bookmarkDetail.get('destinationDetail')}
shouldShowLocation={this.props.bookmarkDetail.get('shouldShowLocation')}
- withStopButton={!isSourceAboutUrl(this.props.location)}
withHomeButton={getSetting(settings.SHOW_HOME_BUTTON)}
- withoutButtons={isSourceAboutUrl(this.props.location) && !getSetting(settings.SHOW_HOME_BUTTON)}
/>
: null
}
{
- isSourceAboutUrl(this.props.location) || this.titleMode
+ this.titleMode
? null
: this.loading
- ?
- :
}
{
!this.titleMode && getSetting(settings.SHOW_HOME_BUTTON)
- ?
: null
}
@@ -155,9 +150,7 @@ class NavigationBar extends ImmutableComponent {
navbutton: true,
bookmarkButton: true,
removeBookmarkButton: this.bookmarked,
- withStopButton: !isSourceAboutUrl(this.props.location),
- withHomeButton: getSetting(settings.SHOW_HOME_BUTTON),
- withoutButtons: isSourceAboutUrl(this.props.location) && !getSetting(settings.SHOW_HOME_BUTTON)
+ withHomeButton: getSetting(settings.SHOW_HOME_BUTTON)
})}
l10nId={this.bookmarked ? 'removeBookmarkButton' : 'addBookmarkButton'}
onClick={this.onToggleBookmark} />
diff --git a/js/components/popupWindow.js b/js/components/popupWindow.js
index 63fd8733c7..96ddece190 100644
--- a/js/components/popupWindow.js
+++ b/js/components/popupWindow.js
@@ -22,7 +22,7 @@ class PopupWindow extends ImmutableComponent {
}
onKeyDown (e) {
- if (e.keyCode === KeyCodes.ESC || e.keyCode === KeyCodes.TAB) {
+ if (e.keyCode === KeyCodes.ESC) {
windowActions.setPopupWindowDetail()
}
}
diff --git a/js/components/sortableTable.js b/js/components/sortableTable.js
index c6a89fa07e..3f055f34ef 100644
--- a/js/components/sortableTable.js
+++ b/js/components/sortableTable.js
@@ -188,7 +188,11 @@ class SortableTable extends ImmutableComponent {
'sort-default': this.sortingDisabled || heading === this.props.defaultHeading})}
data-sort-method={dataType === 'number' ? 'number' : undefined}
data-sort-order={this.props.defaultHeadingSortOrder}>
-
+ {
+ typeof heading === 'string'
+ ?
+ : heading
+ }
})}
diff --git a/js/components/urlBarSuggestions.js b/js/components/urlBarSuggestions.js
index b4a1713133..f69e828fbc 100644
--- a/js/components/urlBarSuggestions.js
+++ b/js/components/urlBarSuggestions.js
@@ -169,6 +169,11 @@ class UrlBarSuggestions extends ImmutableComponent {
this.updateSuggestions(parseInt(e.target.dataset.index, 10))
}
+ componentDidMount () {
+ this.suggestionList = this.getNewSuggestionList()
+ this.searchXHR()
+ }
+
componentWillUpdate (nextProps) {
if (this.selectedElement) {
this.selectedElement.scrollIntoView()
@@ -404,6 +409,11 @@ class UrlBarSuggestions extends ImmutableComponent {
windowActions.setUrlBarSuggestionSearchResults(Immutable.fromJS(xhr.response[1]))
this.updateSuggestions(props.selectedIndex)
}
+
+ xhr.onerror = () => {
+ windowActions.setUrlBarSuggestionSearchResults(Immutable.fromJS([]))
+ this.updateSuggestions(props.selectedIndex)
+ }
} else {
windowActions.setUrlBarSuggestionSearchResults(Immutable.fromJS([]))
this.updateSuggestions(props.selectedIndex)
diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
index b4f1ffa04f..caeaa800ee 100644
--- a/js/constants/appConfig.js
+++ b/js/constants/appConfig.js
@@ -96,6 +96,7 @@ module.exports = {
'general.show-home-button': false,
'general.useragent.value': null, // Set at runtime
'general.autohide-menu': true,
+ 'general.check-default-on-startup': true,
'search.default-search-engine': 'Google',
'search.offer-search-suggestions': false, // false by default for privacy reasons
'tabs.switch-to-new-tabs': false,
diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
index 041e9f9c2a..498a1a9350 100644
--- a/js/constants/appConstants.js
+++ b/js/constants/appConstants.js
@@ -60,7 +60,9 @@ const AppConstants = {
APP_SET_MENUBAR_TEMPLATE: _,
APP_UPDATE_ADBLOCK_DATAFILES: _,
APP_UPDATE_ADBLOCK_CUSTOM_RULES: _,
- APP_SUBMIT_FEEDBACK: _
+ APP_SUBMIT_FEEDBACK: _,
+ APP_DEFAULT_BROWSER_UPDATED: _,
+ APP_DEFAULT_BROWSER_CHECK_COMPLETE: _
}
module.exports = mapValuesByKeys(AppConstants)
diff --git a/js/constants/settings.js b/js/constants/settings.js
index f754f54f71..2e494e1944 100644
--- a/js/constants/settings.js
+++ b/js/constants/settings.js
@@ -14,6 +14,8 @@ const settings = {
BOOKMARKS_TOOLBAR_MODE: 'general.bookmarks-toolbar-mode',
SHOW_BOOKMARKS_TOOLBAR: 'bookmarks.toolbar.show',
LANGUAGE: 'general.language',
+ CHECK_DEFAULT_ON_STARTUP: 'general.check-default-on-startup',
+ IS_DEFAULT_BROWSER: 'general.is-default-browser',
// Search tab
DEFAULT_SEARCH_ENGINE: 'search.default-search-engine',
OFFER_SEARCH_SUGGESTIONS: 'search.offer-search-suggestions',
diff --git a/js/constants/windowConstants.js b/js/constants/windowConstants.js
index 2da41ade7d..f2af206e62 100644
--- a/js/constants/windowConstants.js
+++ b/js/constants/windowConstants.js
@@ -81,7 +81,8 @@ const windowConstants = {
WINDOW_SET_LAST_FOCUSED_SELECTOR: _,
WINDOW_GOT_RESPONSE_DETAILS: _,
WINDOW_SET_BOOKMARKS_TOOLBAR_SELECTED_FOLDER_ID: _,
- WINDOW_ON_FOCUS_CHANGED: _
+ WINDOW_ON_FOCUS_CHANGED: _,
+ WINDOW_SET_MODAL_DIALOG_DETAIL: _
}
module.exports = mapValuesByKeys(windowConstants)
diff --git a/js/settings.js b/js/settings.js
index 6e22266504..4cd66850f0 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -60,7 +60,7 @@ const resolveValue = (settingKey, settingsCollection) => {
module.exports.getSetting = (settingKey, settingsCollection) => {
const setting = resolveValue(settingKey, settingsCollection)
- if (setting) return setting
+ if (typeof setting !== 'undefined') return setting
return getDefaultSetting(settingKey, settingsCollection)
}
diff --git a/js/state/frameStateUtil.js b/js/state/frameStateUtil.js
index 4af752dbef..e665d011a4 100644
--- a/js/state/frameStateUtil.js
+++ b/js/state/frameStateUtil.js
@@ -246,6 +246,7 @@ function cloneFrame (frameOpts, guestInstanceId) {
clone.location = 'about:blank'
clone.src = 'about:blank'
clone.parentFrameKey = frameOpts.key
+ clone.aboutDetails = frameOpts.aboutDetails
return clone
}
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
index 86253317be..3252e4241d 100644
--- a/js/stores/appStore.js
+++ b/js/stores/appStore.js
@@ -44,6 +44,8 @@ const isWindows = process.platform === 'win32'
// Only used internally
const CHANGE_EVENT = 'app-state-change'
+const defaultProtocols = ['https', 'http']
+
let appState
let lastEmittedState
@@ -723,6 +725,18 @@ const handleAppAction = (action) => {
const subject = encodeURIComponent(`Brave ${platform} ${os.arch()} ${app.getVersion()}${channel()} feedback`)
electron.shell.openExternal(`${appConfig.contactUrl}?subject=${subject}`)
break
+ case AppConstants.APP_DEFAULT_BROWSER_UPDATED:
+ if (action.useBrave) {
+ for (const p of defaultProtocols) {
+ app.setAsDefaultProtocolClient(p)
+ }
+ }
+ let isDefaultBrowser = defaultProtocols.every(p => app.isDefaultProtocolClient(p))
+ appState = appState.setIn(['settings', settings.IS_DEFAULT_BROWSER], isDefaultBrowser)
+ break
+ case AppConstants.APP_DEFAULT_BROWSER_CHECK_COMPLETE:
+ appState = appState.set('defaultBrowserCheckComplete', {})
+ break
default:
}
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
index 9fe070bba8..891be3d88c 100644
--- a/js/stores/windowStore.js
+++ b/js/stores/windowStore.js
@@ -842,6 +842,15 @@ const doAction = (action) => {
case WindowConstants.WINDOW_ON_FOCUS_CHANGED:
windowState = windowState.setIn(['ui', 'hasFocus'], action.hasFocus)
break
+ case WindowConstants.WINDOW_SET_MODAL_DIALOG_DETAIL:
+ if (action.className && action.props === undefined) {
+ windowState = windowState.deleteIn(['modalDialogDetail', action.className])
+ } else if (action.className) {
+ windowState = windowState.setIn(['modalDialogDetail', action.className], Immutable.fromJS(action.props))
+ }
+ // Since the input values of address are bound, we need to notify the controls sync.
+ windowStore.emitChanges()
+ break
default:
}
diff --git a/less/about/bookmarks.less b/less/about/bookmarks.less
index 83f9c7747c..84c06e4c8e 100644
--- a/less/about/bookmarks.less
+++ b/less/about/bookmarks.less
@@ -25,7 +25,6 @@
font-weight: 300;
padding: 8px;
box-sizing: border-box;
- border-right: 1px solid @braveOrange;
padding-left: 10px;
-webkit-user-select: none;
cursor: default;
@@ -43,7 +42,6 @@
> .bookmarkFolderList {
display: block;
- border-right: 1px solid @braveOrange;
height: 100%;
.listItem >* {
@@ -65,12 +63,13 @@
}
.organizeView {
flex-grow: 5;
-
+ border-left: 1px solid @braveOrange;
.sortableTable {
-webkit-user-select: none;
- th:nth-of-type(2), td.date {
- width: 250px;
- }
+ // Custom title column (has add bookmark icon)
+ th:first-of-type > div { display: block; }
+ // Bookmark last visited column
+ th:nth-of-type(2), td.date { width: 250px; }
td {
font-size: 11pt;
padding-left: 10px;
diff --git a/less/about/preferences.less b/less/about/preferences.less
index d36982acd8..0d2ba454d4 100644
--- a/less/about/preferences.less
+++ b/less/about/preferences.less
@@ -372,6 +372,8 @@ span.browserButton.primaryButton {
&.clearBrowsingDataButton,
&.importNowButton,
+ &.setAsDefaultButton,
+ &.manageAdblockSettings,
&.manageAutofillDataButton {
font-size: 0.9em;
margin-top: 20px;
@@ -381,6 +383,10 @@ span.browserButton.primaryButton {
&.importNowButton {
margin-top: 5px;
}
+
+ &.setAsDefaultButton {
+ margin-top: 5px;
+ }
}
.settingsList {
diff --git a/less/forms.less b/less/forms.less
index f84c8bcc1f..0f2783154c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -196,6 +196,63 @@
}
}
+.checkDefaultBrowserDialog {
+ .checkDefaultBrowser {
+ .flyoutDialog;
+ background-color: #f7f7f7;
+ border-radius: @borderRadius;
+ max-width: 422px;
+ padding: 1;
+ text-align: left;
+ width: 614px;
+ height: 120px;
+ -webkit-user-select: none;
+ cursor: default;
+ color: #3B3B3B;
+ overflow-x: hidden;
+ overflow-y: hidden;
+ max-height: 100%;
+
+ .clickable {
+ color: #5B5B5B;
+ &:hover {
+ color: #000;
+ }
+ }
+
+ .checkDefaultBrowserButtons {
+ text-align: right;
+ padding: 16px 10px;
+ position: relative;
+ top: -30px;
+ }
+
+ .makeBraveDefault {
+ font-weight: bold;
+ display: inline-block;
+ position: relative;
+ top: -35px;
+ margin-left: 15px;
+ }
+
+ .braveIcon {
+ background-image: -webkit-image-set(url(../app/extensions/brave/img/braveAbout.png) 2x);
+ background-repeat: no-repeat;
+ height: 64px;
+ width: 64px;
+ display: inline-block;
+ position: relative;
+ top: 10px;
+ }
+
+ .checkDefaultOnStartup {
+ left: 75px;
+ position: relative;
+ top: -25px;
+ }
+ }
+}
+
.braveryPanelContainer {
.braveryPanel {
@@ -429,14 +486,8 @@
bottom: 10px;
left: 37px;
- &.withoutButtons {
- left: 6px;
- }
-
- &.withStopButton {
- &.withHomeButton {
- left: 67px;
- }
+ &.withHomeButton {
+ left: 67px;
}
}
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 96bc7e1730..8e1aa4664a 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -442,17 +442,21 @@
.back,
.forward {
- width: @navbarButtonWidth;
+ background-color: @buttonColor;
+ width: 12px;
+ height: 15px;
+ margin: 0 6px;
}
-
.back {
padding-right: @navbarButtonSpacing;
+ -webkit-mask-image: url('../img/toolbar/back_btn.svg');
+ -webkit-mask-repeat: no-repeat;
}
-
.forward {
padding-left: @navbarButtonSpacing;
+ -webkit-mask-image: url('../img/toolbar/forward_btn.svg');
+ -webkit-mask-repeat: no-repeat;
}
-
}
// Navigation bar at the center
@@ -519,6 +523,38 @@
}
}
+#navigator {
+ .startButtons {
+ .navigationButton {
+ background-color: @buttonColor;
+ width: 12px;
+ height: 15px;
+ margin: 0 6px;
+
+ &:hover {
+ background-color: @gray;
+ }
+ }
+
+ .stopButton {
+ -webkit-mask-image: url('../img/toolbar/stoploading_btn.svg');
+ -webkit-mask-repeat: no-repeat;
+ }
+
+ .reloadButton {
+ -webkit-mask-image: url('../img/toolbar/reload_btn.svg');
+ -webkit-mask-repeat: no-repeat;
+ }
+
+ .homeButton {
+ -webkit-mask-image: url('../img/toolbar/home_btn.svg');
+ -webkit-mask-repeat: no-repeat;
+ width: 14px;
+ height: 14px;
+ }
+ }
+}
+
.navigatorWrapper {
justify-content: space-between;
@@ -547,9 +583,7 @@
}
&:not([disabled]):hover {
- color: @buttonColor;
- opacity: 1.0;
- background-color: white;
+ opacity: 0.2;
}
}
@@ -641,10 +675,6 @@
line-height: 25px;
margin-top: 2px;
margin-right: -2px;
-
- &.withoutButtons {
- margin-bottom: 2px;
- }
}
}
diff --git a/package.json b/package.json
index 4ac5584200..df883998fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "brave",
- "version": "0.12.5",
+ "version": "0.12.6",
"description": "Brave laptop and desktop browser",
"main": "./app/index.js",
"config": {
@@ -91,11 +91,12 @@
"keytar": "^3.0.0",
"l20n": "^3.5.1",
"ledger-balance": "^0.8.61",
- "ledger-client": "^0.8.88",
+ "ledger-client": "^0.8.89",
"ledger-geoip": "^0.8.72",
- "ledger-publisher": "^0.8.88",
+ "ledger-publisher": "^0.8.89",
"lru_cache": "^1.0.0",
"moment": "^2.15.1",
+ "punycode": "^2.0.0",
"qr-image": "^3.1.0",
"random-lib": "2.1.0",
"react": "^15.0.1",
diff --git a/res/app.icns b/res/app.icns
index 3a24a4d29f..73b982127d 100644
Binary files a/res/app.icns and b/res/app.icns differ
diff --git a/res/app.ico b/res/app.ico
index 374fb80899..fa029fe762 100644
Binary files a/res/app.ico and b/res/app.ico differ
diff --git a/res/app.png b/res/app.png
index bb600ff79f..03d5989587 100644
Binary files a/res/app.png and b/res/app.png differ
diff --git a/res/background.png b/res/background.png
index 04e72484ac..9cdb796287 100644
Binary files a/res/background.png and b/res/background.png differ
diff --git a/res/brave_installer.icns b/res/brave_installer.icns
index 53c4c29bd7..49951e4749 100644
Binary files a/res/brave_installer.icns and b/res/brave_installer.icns differ
diff --git a/res/brave_installer.ico b/res/brave_installer.ico
new file mode 100644
index 0000000000..3664ca2bda
Binary files /dev/null and b/res/brave_installer.ico differ
diff --git a/res/brave_installer.png b/res/brave_installer.png
new file mode 100644
index 0000000000..c637db6a76
Binary files /dev/null and b/res/brave_installer.png differ
diff --git a/res/brave_splash_installing.gif b/res/brave_splash_installing.gif
index 4c9dbf39a0..1e3dce7db6 100644
Binary files a/res/brave_splash_installing.gif and b/res/brave_splash_installing.gif differ
diff --git a/res/start-tile-150.png b/res/start-tile-150.png
index d6bf5c1321..85fa448a2c 100644
Binary files a/res/start-tile-150.png and b/res/start-tile-150.png differ
diff --git a/res/start-tile-70.png b/res/start-tile-70.png
index fde8a343dd..967c1d0b0f 100644
Binary files a/res/start-tile-70.png and b/res/start-tile-70.png differ
diff --git a/test/about/historyTest.js b/test/about/historyTest.js
index e311753c75..8ebc5e3c23 100644
--- a/test/about/historyTest.js
+++ b/test/about/historyTest.js
@@ -9,11 +9,14 @@ describe('about:history', function () {
Brave.beforeAll(this)
before(function * () {
+ const page1 = Brave.server.url('page1.html')
+
yield this.app.client
.waitForUrl(Brave.newTabUrl)
.waitForBrowserWindow()
.waitForVisible(urlInput)
.windowByUrl(Brave.browserWindowUrl)
+ .addSite({ location: page1, title: 'Page 1' })
.addSite({ location: 'https://brave.com', title: 'Brave' })
.addSite({ location: 'https://brave.com/test', customTitle: 'customTest' })
.addSite({ location: 'https://www.youtube.com' })
@@ -39,79 +42,99 @@ describe('about:history', function () {
.waitForVisible('table.sortableTable thead tr th.sort-up div[data-l10n-id="time"]')
})
- // Multi Select
- it('Simulate cmd/control click behavior', function * () {
- yield this.app.client
- .tabByUrl(aboutHistoryUrl)
- .click('table.sortableTable td.title[data-sort="Brave"]')
- .isDarwin().then((val) => {
- if (val === true) {
- return this.app.client.keys(Brave.keys.COMMAND)
- } else {
- return this.app.client.keys(Brave.keys.CONTROL)
- }
- })
- .click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
- .waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
- // key depressed
- .isDarwin().then((val) => {
- if (val === true) {
- return this.app.client.keys(Brave.keys.COMMAND)
- } else {
- return this.app.client.keys(Brave.keys.CONTROL)
- }
- })
- .click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
- .waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
- .waitForVisible('table.sortableTable td.title[data-sort="Brave"]')
- .waitForVisible('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
- // reset state
- .click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
- .waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
+ describe('double click', function () {
+ it('opens a new tab with the location of the entry when double clicked', function * () {
+ const page1 = Brave.server.url('page1.html')
+
+ yield this.app.client
+ .tabByUrl(aboutHistoryUrl)
+ .doubleClick('table.sortableTable td.title[data-sort="Page 1"]')
+ .waitUntil(function () {
+ return this.getTabCount().then((count) => {
+ return count === 2
+ })
+ })
+ .waitForUrl(page1)
+ .tabByIndex(0)
+ })
})
- it('Simulate shift click behavior', function * () {
- yield this.app.client
- .tabByUrl(aboutHistoryUrl)
- .click('table.sortableTable td.title[data-sort="Brave"]')
- .keys(Brave.keys.SHIFT)
- .click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
- .waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
- // key depressed
- .keys(Brave.keys.SHIFT)
- .click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
- .isDarwin().then((val) => {
- if (val === true) {
- return this.app.client.keys(Brave.keys.COMMAND)
- } else {
- return this.app.client.keys(Brave.keys.CONTROL)
- }
- })
- .click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
- // key depressed
- .isDarwin().then((val) => {
- if (val === true) {
- return this.app.client.keys(Brave.keys.COMMAND)
- } else {
- return this.app.client.keys(Brave.keys.CONTROL)
- }
- })
- .keys(Brave.keys.SHIFT)
- .click('table.sortableTable td.title[data-sort="Brave"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
- .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
- // reset state
- // key depressed
- .keys(Brave.keys.SHIFT)
- .click('table.sortableTable td.title[data-sort="Brave"]')
+
+ describe('multi-select', function () {
+ it('selects multiple rows when clicked with cmd/control', function * () {
+ yield this.app.client
+ .tabByUrl(aboutHistoryUrl)
+ .loadUrl(aboutHistoryUrl)
+ .click('table.sortableTable td.title[data-sort="Brave"]')
+ .isDarwin().then((val) => {
+ if (val === true) {
+ return this.app.client.keys(Brave.keys.COMMAND)
+ } else {
+ return this.app.client.keys(Brave.keys.CONTROL)
+ }
+ })
+ .click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
+ .waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
+ // key depressed
+ .isDarwin().then((val) => {
+ if (val === true) {
+ return this.app.client.keys(Brave.keys.COMMAND)
+ } else {
+ return this.app.client.keys(Brave.keys.CONTROL)
+ }
+ })
+ .click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
+ .waitForVisible('table.sortableTable td.title[data-sort="https://brave.com/test"]')
+ .waitForVisible('table.sortableTable td.title[data-sort="Brave"]')
+ .waitForVisible('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
+ // reset state
+ .click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
+ .waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
+ })
+ it('selects multiple contiguous rows when shift clicked', function * () {
+ yield this.app.client
+ .tabByUrl(aboutHistoryUrl)
+ .loadUrl(aboutHistoryUrl)
+ .click('table.sortableTable td.title[data-sort="Brave"]')
+ .keys(Brave.keys.SHIFT)
+ .click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
+ .waitForVisible('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
+ // key depressed
+ .keys(Brave.keys.SHIFT)
+ .click('table.sortableTable td.title[data-sort="https://www.facebook.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
+ .isDarwin().then((val) => {
+ if (val === true) {
+ return this.app.client.keys(Brave.keys.COMMAND)
+ } else {
+ return this.app.client.keys(Brave.keys.CONTROL)
+ }
+ })
+ .click('table.sortableTable td.title[data-sort="https://www.youtube.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
+ // key depressed
+ .isDarwin().then((val) => {
+ if (val === true) {
+ return this.app.client.keys(Brave.keys.COMMAND)
+ } else {
+ return this.app.client.keys(Brave.keys.CONTROL)
+ }
+ })
+ .keys(Brave.keys.SHIFT)
+ .click('table.sortableTable td.title[data-sort="Brave"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="Brave"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.youtube.com"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://brave.com/test"]')
+ .waitForVisible('table.sortableTable tr.selected td.title[data-sort="https://www.facebook.com"]')
+ // reset state
+ // key depressed
+ .keys(Brave.keys.SHIFT)
+ .click('table.sortableTable td.title[data-sort="Brave"]')
+ })
})
})
diff --git a/test/about/preferencesTest.js b/test/about/preferencesTest.js
new file mode 100644
index 0000000000..6f894f8b82
--- /dev/null
+++ b/test/about/preferencesTest.js
@@ -0,0 +1,36 @@
+/* global describe, it, beforeEach */
+
+const Brave = require('../lib/brave')
+const {urlInput, homepageInput} = require('../lib/selectors')
+
+const prefsUrl = 'about:preferences'
+
+function * setup (client) {
+ yield client
+ .waitForUrl(Brave.newTabUrl)
+ .waitForBrowserWindow()
+ .waitForVisible(urlInput)
+}
+
+describe('General Panel', function () {
+ describe('homepage', function () {
+ Brave.beforeEach(this)
+ beforeEach(function * () {
+ yield setup(this.app.client)
+ })
+
+ it('homepage displays punycode', function * () {
+ yield this.app.client
+ .tabByIndex(0)
+ .loadUrl(prefsUrl)
+ .waitForVisible(homepageInput)
+ .click(homepageInput)
+ .keys('а')
+ .waitUntil(function () {
+ return this.getValue(homepageInput).then((val) => {
+ return val === 'https://www.brave.xn--com-7cd'
+ })
+ })
+ })
+ })
+})
diff --git a/test/components/navigationBarTest.js b/test/components/navigationBarTest.js
index 5112fbad78..00aa988bf6 100644
--- a/test/components/navigationBarTest.js
+++ b/test/components/navigationBarTest.js
@@ -74,6 +74,7 @@ describe('navigationBar', function () {
it('updates the location in the navbar when changed by the opener', function * () {
yield this.app.client
.windowByUrl(Brave.browserWindowUrl)
+ .ipcSend('shortcut-focus-url')
.waitUntil(function () {
return this.getValue(urlInput).then((val) => val === 'data:text/html;,%3Ctitle%3ETabnapping%20Target%3C/title%3E')
})
@@ -730,18 +731,27 @@ describe('navigationBar', function () {
yield this.app.client.waitUntil(function () {
return this.getValue(urlInput).then((val) => val === '')
})
+
+ yield this.app.client
+ .addSite({ location: 'https://brave.com', title: 'Brave' })
+
// now type something
- yield this.app.client.keys('a')
+ yield this.app.client
+ .setValue(urlInput, 'b')
+ .waitForExist(urlBarSuggestions + ' li')
})
- it('sets the value to "a"', function * () {
+ it('sets the value to "b"', function * () {
yield this.app.client.waitUntil(function () {
- return this.getValue(urlInput).then((val) => val === 'a')
+ return this.getValue(urlInput).then((val) => val === 'brave.com')
})
})
it('clears the selected text', function * () {
- yield selectsText(this.app.client, '')
+ // Since now the first letter will trigger the autocomplete
+ // expect the selected text to be part of the first suggestion
+ // in the list
+ yield selectsText(this.app.client, 'rave.com')
})
describe('shortcut-focus-url', function () {
@@ -755,7 +765,9 @@ describe('navigationBar', function () {
})
it('selects the text', function * () {
- yield selectsText(this.app.client, 'a')
+ // Since now the first letter will trigger the autocomplete
+ // expect the selected text to be the first suggestion in the list
+ yield selectsText(this.app.client, 'brave.com')
})
it('has the file icon', function * () {
@@ -949,7 +961,9 @@ describe('navigationBar', function () {
.waitUntil(function () {
return this.getValue(urlInput).then((val) => val === 'a')
})
- yield selectsText(this.app.client, '')
+ .waitUntil(function () {
+ return this.getSelectedText().then(function (value) { return value === '' })
+ })
})
})
@@ -991,10 +1005,14 @@ describe('navigationBar', function () {
yield this.app.client.waitUntil(function () {
return this.getValue(urlInput).then((val) => val === '')
})
+
+ yield this.app.client
+ .addSite({ location: 'https://brave.com', title: 'Brave' })
+
// now type something
- yield this.app.client.keys('a')
+ yield this.app.client.keys('b')
yield this.app.client.waitUntil(function () {
- return this.getValue(urlInput).then((val) => val === 'a')
+ return this.getValue(urlInput).then((val) => val === 'b')
})
yield blur(this.app.client)
yield this.app.client
@@ -1007,7 +1025,7 @@ describe('navigationBar', function () {
})
it('selects the text', function * () {
- yield selectsText(this.app.client, 'a')
+ yield selectsText(this.app.client, 'brave.com')
})
})
diff --git a/test/components/urlBarSuggestionsTest.js b/test/components/urlBarSuggestionsTest.js
index 6694d03dc6..d340e6e27c 100644
--- a/test/components/urlBarSuggestionsTest.js
+++ b/test/components/urlBarSuggestionsTest.js
@@ -35,6 +35,16 @@ describe('urlbarSuggestions', function () {
})
})
+ it('show suggestion when single letter is typed in', function * () {
+ yield this.app.client.ipcSend('shortcut-focus-url')
+ .waitForElementFocus(urlInput)
+ .setValue(urlInput, 'a')
+ .waitUntil(function () {
+ return this.getValue(urlInput).then((val) => val === 'a')
+ })
+ .waitForExist(urlBarSuggestions)
+ })
+
it('deactivates suggestions on escape', function * () {
yield this.app.client
.setValue(urlInput, 'Page 1')
diff --git a/test/lib/selectors.js b/test/lib/selectors.js
index 6b9951d985..2756913806 100644
--- a/test/lib/selectors.js
+++ b/test/lib/selectors.js
@@ -50,6 +50,7 @@ module.exports = {
securityTab: '[data-l10n-id="security"]',
paymentsTab: '[data-l10n-id="payments"]',
saveButton: '[data-l10n-id="save"]',
+ homepageInput: '[data-l10n-id="homepageInput"]',
walletSwitch: '.enablePaymentsSwitch .switchBackground',
addFundsButton: '.addFunds',
fundsSelectBox: '#fundsSelectBox',
diff --git a/tools/buildInstaller.js b/tools/buildInstaller.js
index 0f559558b7..48e68a9100 100644
--- a/tools/buildInstaller.js
+++ b/tools/buildInstaller.js
@@ -68,7 +68,7 @@ if (isDarwin) {
title: 'Brave',
authors: 'Brave Software',
loadingGif: 'res/brave_splash_installing.gif',
- setupIcon: 'res/app.ico',
+ setupIcon: 'res/brave_installer.ico',
iconUrl: 'https://brave.com/favicon.ico',
signWithParams: format('-a -fd sha256 -f "%s" -p "%s" -t http://timestamp.verisign.com/scripts/timstamp.dll', path.resolve(cert), certPassword),
exe: 'Brave.exe'
diff --git a/tools/cibuild.py b/tools/cibuild.py
index f5005db783..7d45bfb855 100755
--- a/tools/cibuild.py
+++ b/tools/cibuild.py
@@ -5,7 +5,7 @@
import sys
import os.path
-BRAVE_ELECTRON = '1.4.14'
+BRAVE_ELECTRON = '1.4.16'
UPSTREAM_ELECTRON = '1.4.0'
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64'