Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
4dbe24c
Setup tooltip trigger
ShishKabab May 9, 2018
202d7f2
Integrate Direct Linking backend for creation
ShishKabab May 9, 2018
5d64a70
Implement redirect on direct link request
ShishKabab May 9, 2018
4fc21f5
Link redirecting and highlight anchoring
ShishKabab May 9, 2018
b8e400d
Implement scrolling and hack in highlight color
ShishKabab May 9, 2018
feacbb0
Refactor direct-linking module and solve mixed content issue
ShishKabab May 10, 2018
bf93783
Make anchoring more redundant
ShishKabab May 14, 2018
1cd1958
React tooltip preparation
ShishKabab May 15, 2018
cbd770a
Start implementing modular storage
ShishKabab May 16, 2018
ba1b559
Support dynamic content
ShishKabab May 17, 2018
7b97ee5
Remove Radium dependency.
digi0ps May 16, 2018
630adea
Enable toggling of tooltip.
digi0ps May 16, 2018
6d5f157
Created different tooltip states and add styles.
digi0ps May 17, 2018
d2429d6
Add loader and style the tooltips.
digi0ps May 17, 2018
a2f0826
Revamped CSS according to new design.
digi0ps May 18, 2018
1f6e58f
Add side buttons.
digi0ps May 18, 2018
dfb8ee0
Prevent closing of tooltip when pressed cross.
digi0ps May 18, 2018
5f68cf1
Don't prepend term/ to indexed terms
ShishKabab May 18, 2018
2e7576b
Send direct link straight to clipboard after creation
ShishKabab May 18, 2018
fc64c97
Attempt to fix anchoring
ShishKabab May 18, 2018
58145ef
Finish intial storage refactor and store more Direct Link data
ShishKabab May 22, 2018
c59b151
Scroll with margin to direct link
ShishKabab May 22, 2018
695fe08
Refactor storage manager
ShishKabab May 23, 2018
cbd4faa
Further Storage refactoring
ShishKabab May 23, 2018
9950ea5
Remove JSON stringification for storage
ShishKabab May 23, 2018
653d929
Slight tooltip refactor
ShishKabab May 23, 2018
41f782f
Add typings for new modular storage classes
poltak May 24, 2018
0caaab6
Slight tooltip refactor
ShishKabab May 24, 2018
f18011d
Store page URL of direct link
ShishKabab May 24, 2018
d9276b8
Remove console.log statements
ShishKabab May 24, 2018
fb2de6f
Add ability to pause automatic direct link anchoring for debugging pu…
ShishKabab May 29, 2018
9c10a02
Bugfixes in content tooltip
ShishKabab May 29, 2018
227f368
Fully destroy tooltip when it's closed
ShishKabab May 30, 2018
e9a34ea
Port over Hypothes.is anchoring strategy
ShishKabab May 31, 2018
3e35314
Generate Direct Link on mouse down
ShishKabab May 31, 2018
f61ea6d
Small fix
ShishKabab May 31, 2018
7edf66b
Fixed highlighting issue
ShishKabab May 31, 2018
1c0ae18
Add tooltip option to Settings.
digi0ps May 21, 2018
1ae9f55
Enable toggling of Tooltip in Popup.
digi0ps May 22, 2018
4e15122
Check for tooltip state in each interaction.
digi0ps May 22, 2018
dd63b64
Create new toggleSwitch component with text inside.
digi0ps May 23, 2018
602c146
Close popup after turning off tooltip.
digi0ps May 24, 2018
e8bca9d
Add info icon and separate css.
digi0ps May 24, 2018
76d0277
Vertical align info button and on/off spacing.
digi0ps May 26, 2018
4c46274
Fix typo.
digi0ps May 29, 2018
cf02d49
Fixed weird styling issue.
digi0ps Jun 4, 2018
030b1f6
Add space between info icon and text.
digi0ps Jun 12, 2018
b9b38c2
Re-order selectors used when trying to anchor quote
ShishKabab Jun 12, 2018
041b233
Merge pull request #402 from digi0ps/tooltip-options
ShishKabab Jun 13, 2018
a5afaf8
Add annotation selector breacrumb for Direct Linking
ShishKabab Jun 13, 2018
f6a688f
Detect when anchoring has failed in graceful way to allow for renderi…
ShishKabab Jun 14, 2018
3af67fd
new publishing script, disable notification for new features
blackforestboi Apr 20, 2018
4b74952
version update to 0.3.2
blackforestboi May 14, 2018
7c267d0
Update on version 0.3.3. for new release.
blackforestboi May 17, 2018
4cfca15
Integrate Direct Linking backend for creation
ShishKabab May 9, 2018
1f35b8d
Implement scrolling and hack in highlight color
ShishKabab May 9, 2018
0202fbb
React tooltip preparation
ShishKabab May 15, 2018
f92b745
Created different tooltip states and add styles.
digi0ps May 17, 2018
f25ad21
Port over Hypothes.is anchoring strategy
ShishKabab May 31, 2018
2611bb8
Enable storybook for Tooltip.
digi0ps Jun 7, 2018
59c50fb
Get basic tooltip design up.
digi0ps Jun 7, 2018
7eb151a
Show description for tooltip icons.
digi0ps Jun 7, 2018
dbb29c0
Add temporary designs for loading and copied states.
digi0ps Jun 8, 2018
0d03026
Delete description feature.
digi0ps Jun 13, 2018
1f05346
Update designs and add animations.
digi0ps Jun 13, 2018
e227333
Tweaks to css and animations.
digi0ps Jun 14, 2018
b53d5e3
Add content_script.css in web_accesible_resources.
digi0ps Jun 14, 2018
3888cfc
Clean up css and minor tweaks.
digi0ps Jun 14, 2018
432ccff
Fix some rebasing errors.
digi0ps Jun 14, 2018
1fa397b
Increase tooltip width.
digi0ps Jun 14, 2018
68d879a
Remove storybook dev shortcuts.
digi0ps Jun 14, 2018
6a4dbb3
change margins of copied text.
blackforestboi Jun 14, 2018
e524f94
Change line-height and remove tooltipStates.jsx.
digi0ps Jun 15, 2018
5b294f6
small spacing change
blackforestboi Jun 15, 2018
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ coverage/
publish.sh
stats.json
.sentryclirc
.DS_Store
.DS_Store
2 changes: 1 addition & 1 deletion build/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import initLoaderRules from './loaders'
import initPlugins from './plugins'
import initMinimizers from './minimizers'

export const extensions = ['.ts', '.tsx', '.js', '.jsx']
export const extensions = ['.ts', '.tsx', '.js', '.jsx', '.coffee']

export const entry = {
background: './src/background-entry.js',
Expand Down
14 changes: 12 additions & 2 deletions build/loaders.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ export const tsLoader = {
},
}

export const coffeescriptLoader = {
loader: 'coffeescript-loader',
}

export const injectStylesLoader = {
loader: 'style-loader',
}
Expand Down Expand Up @@ -83,6 +87,12 @@ export default ({ mode, context, isCI = false, injectStyles = false }) => {
use: [babelLoader, tsLoader],
}

const coffee = {
test: /\.coffee?$/,
include: path.resolve(context, './src/direct-linking'),
use: [babelLoader, coffeescriptLoader],
}

const cssModules = {
test: /\.css$/,
include: path.resolve(context, './src'),
Expand All @@ -102,12 +112,12 @@ export default ({ mode, context, isCI = false, injectStyles = false }) => {
}

if (isCI) {
return [main, cssModules, cssVanilla]
return [main, coffee, cssModules, cssVanilla]
}

if (mode !== 'production') {
main.use = [threadLoader, ...main.use]
}

return [main, lint, cssModules, cssVanilla]
return [main, coffee, lint, cssModules, cssVanilla]
}
94 changes: 50 additions & 44 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,53 +305,59 @@ gulp.task(

// Tasks for publishing the extension

gulp.task('publish-extension:chrome', ['package'], () => {
const extensionID = process.env.WEBSTORE_EXTENSION_ID
const webStore = ChromeStore({
extensionId: extensionID,
clientId: process.env.WEBSTORE_CLIENT_ID,
clientSecret: process.env.WEBSTORE_CLIENT_SECRET,
refreshToken: process.env.WEBSTORE_REFRESH_TOKEN,
})
const tokenP = webStore.fetchToken()
const uploadP = tokenP.then(token =>
webStore.uploadExisting(
fs.createReadStream('dist/extension.zip'),
token,
),
)
gulp.task(
'publish-extension:chrome',
/*['package'],*/ () => {
const extensionID = process.env.WEBSTORE_EXTENSION_ID
const webStore = ChromeStore({
extensionId: extensionID,
clientId: process.env.WEBSTORE_CLIENT_ID,
clientSecret: process.env.WEBSTORE_CLIENT_SECRET,
refreshToken: process.env.WEBSTORE_REFRESH_TOKEN,
})
const tokenP = webStore.fetchToken()
const uploadP = tokenP.then(token =>
webStore.uploadExisting(
fs.createReadStream('dist/extension.zip'),
token,
),
)

return Promise.all([tokenP, uploadP]).then(([token]) =>
webStore.publish('default', token),
)
})
return Promise.all([tokenP, uploadP]).then(([token]) =>
webStore.publish('default', token),
)
},
)

gulp.task('publish-extension:firefox', ['package'], () => {
return signAddon({
id: 'info@worldbrain.io',
xpiPath: 'dist/extension.zip',
version: JSON.parse(fs.readFileSync('package.json')).version,
apiKey: process.env.AMO_API_KEY,
apiSecret: process.env.AMO_API_SECRET,
channel: 'listed',
downloadDir: 'downloaded_amo',
})
.then(function(result) {
if (result.success) {
console.log('The following signed files were downloaded:')
console.log(result.downloadedFiles)
console.log('Your extension ID is:')
console.log(result.id)
} else {
console.error('Your add-on could not be signed!')
console.error('Check the console for details.')
}
console.log(result.success ? 'SUCCESS' : 'FAIL')
})
.catch(function(error) {
console.error('Signing error:', error)
gulp.task(
'publish-extension:firefox',
/*['package'],*/ () => {
return signAddon({
id: 'info@worldbrain.io',
xpiPath: 'dist/extension.zip',
version: JSON.parse(fs.readFileSync('package.json')).version,
apiKey: process.env.AMO_API_KEY,
apiSecret: process.env.AMO_API_SECRET,
channel: 'listed',
downloadDir: 'downloaded_amo',
})
})
.then(function(result) {
if (result.success) {
console.log('The following signed files were downloaded:')
console.log(result.downloadedFiles)
console.log('Your extension ID is:')
console.log(result.id)
} else {
console.error('Your add-on could not be signed!')
console.error('Check the console for details.')
}
console.log(result.success ? 'SUCCESS' : 'FAIL')
})
.catch(function(error) {
console.error('Signing error:', error)
})
},
)

gulp.task('publish-extension', [
'publish-extension:chrome',
Expand Down
1 change: 1 addition & 0 deletions img/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions img/cross.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions img/cross_grey.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/green_check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading