Skip to content

Commit

Permalink
a bunch of typos fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@qazbnm456
qazbnm456 committed Jul 10, 2017
1 parent 5c5c40c commit f601177
Show file tree
Hide file tree
Showing 17 changed files with 243 additions and 329 deletions.
2 changes: 1 addition & 1 deletion helper/api/extensions/ipc-event.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 39,7 @@ class Event {
if (index !== -1) {
this.listeners.splice(index, 1);
}
ipcRenderer.removeAllListeners([`lulumi-${this.scope}-add-listener-${this.event}-result-${digest}`]);
ipcRenderer.removeAllListeners(`lulumi-${this.scope}-add-listener-${this.event}-result-${digest}`);
ipcRenderer.send(`lulumi-${this.scope}-remove-listener-${this.event}`, digest);
}

Expand Down
4 changes: 1 addition & 3 deletions helper/api/extensions/port.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 65,7 @@ class Port {

_onDisconnect () {
this.disconnected = true;
ipcRenderer.removeAllListeners([
`lulumi-runtime-port-${this.extensionId}`,
]);
ipcRenderer.removeAllListeners(`lulumi-runtime-port-${this.extensionId}`);
this.onDisconnect.emit();
}
}
Expand Down
28 changes: 16 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 38,7 @@
"strip-css-comments": "^3.0.0",
"vue": "^2.3.4",
"vue-electron": "^1.0.6",
"vue-i18n": "^7.0.3",
"vue-i18n": "^7.0.5",
"vue-router": "^2.6.0",
"vuex": "^2.3.1"
},
Expand All @@ -50,13 50,13 @@
"babel-loader": "^7.1.1",
"babel-plugin-istanbul": "^4.1.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.5.2",
"babel-preset-env": "^1.6.0",
"babel-preset-stage-0": "^6.24.1",
"babel-register": "^6.24.1",
"babili-webpack-plugin": "^0.1.2",
"cfonts": "^1.1.3",
"chai": "^4.0.2",
"chalk": "^1.1.3",
"chalk": "^2.0.1",
"cross-env": "^5.0.1",
"css-loader": "^0.28.4",
"del": "^3.0.0",
Expand All @@ -67,19 67,19 @@
"electron-packager": "^8.7.2",
"electron-rebuild": "^1.5.11",
"element-ui": "^1.3.7",
"eslint": "4.1.1",
"eslint": "4.2.0",
"eslint-config-airbnb-base": "^11.2.0",
"eslint-friendly-formatter": "^3.0.0",
"eslint-import-resolver-webpack": "^0.8.3",
"eslint-loader": "^1.8.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-html": "^3.0.0",
"eslint-plugin-import": "^2.6.0",
"eslint-plugin-import": "^2.7.0",
"extract-text-webpack-plugin": "^2.1.2",
"file-loader": "^0.11.2",
"git-rev-sync": "^1.9.1",
"html-webpack-plugin": "^2.29.0",
"inject-loader": "^3.0.0",
"iview": "^2.0.0-rc.17",
"iview": "^2.0.0-rc.18",
"json-loader": "^0.5.4",
"karma": "^1.7.0",
"karma-chai": "^0.1.0",
Expand All @@ -88,9 88,9 @@
"karma-mocha": "^1.3.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.31",
"karma-webpack": "^2.0.3",
"karma-webpack": "^2.0.4",
"less": "^2.7.2",
"less-loader": "^4.0.4",
"less-loader": "^4.0.5",
"mocha": "^3.4.2",
"mockery": "^2.1.0",
"multispinner": "^0.2.1",
Expand All @@ -99,7 99,7 @@
"require-dir": "^0.3.2",
"sinon": "^2.3.6",
"sortablejs": "^1.6.0",
"spectron": "^3.7.1",
"spectron": "^3.7.2",
"style-loader": "^0.18.2",
"tree-kill": "^1.1.0",
"url-loader": "^0.5.9",
Expand All @@ -111,8 111,8 @@
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.3.4",
"webpack": "^2.6.1",
"webpack-dev-server": "^2.5.0",
"webpack-hot-middleware": "^2.18.0",
"webpack-dev-server": "^2.5.1",
"webpack-hot-middleware": "^2.18.2",
"webpack-merge": "^4.1.0"
},
"ava": {
Expand All @@ -125,5 125,9 @@
"require": [
"babel-register"
]
},
"engines": {
"node": ">=8",
"npm": ">=4"
}
}
4 changes: 1 addition & 3 deletions src/guest/renderer/components/AboutMainView/Downloads.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 89,7 @@
beforeDestroy() {
this.clear();
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
Expand Down
8 changes: 3 additions & 5 deletions src/guest/renderer/components/AboutMainView/History.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 12,7 @@
el-button(:disabled="sync", type="info", @click="setHistory") {{ $t('about.historyPage.clear') }}
el-row
el-col(:span="24")
el-tree(ref="tree", :empty-text="$t('about.historyPage.noData')", :data="data", :show-checkbox="true", :default-expand-all="true", :render-content="render", :filter-node-method="filterNode")
el-tree(ref="tree", :empty-text="$t('about.historyPage.noData')", :data="data", :show-checkbox="true", :default-expand-all="true", :render-content="customRender", :filter-node-method="filterNode")
</template>

<script>
Expand Down Expand Up @@ -103,7 103,7 @@
}
return newArr;
},
render(h, node) {
customRender(h, node) {
const history = node.data;
if (history.children) {
return h('span', history.label);
Expand All @@ -129,9 129,7 @@
beforeDestroy() {
this.clear();
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/guest/renderer/components/AboutMainView/Lulumi.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 6,7 @@
el-table-column(:label="$t('about.lulumiPage.value')", width="180", align="center")
template(scope="scope")
a.cell(v-if="scope.row.key === 'rev'", :href="`https://github.com/qazbnm456/lulumi-browser/commit/${scope.row.value}`") {{ scope.row.value.substring(0, 7) }}
.cell(v-else-if="scope.row.key === 'userData'", style="color: cornflowerblue; cursor: pointer;", @click="showItemInFolder(`${scope.row.value}`)") {{ scope.row.value }}
.cell(v-else-if="scope.row.key === 'userData'", style="color: cornflowerblue; cursor: pointer;", @click="showItemInFolder(scope.row.value)") {{ scope.row.value }}
.cell(v-else) {{ scope.row.value }}
</template>

Expand Down
4 changes: 1 addition & 3 deletions src/guest/renderer/components/AboutMainView/Preferences/Homepage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 35,7 @@
},
beforeDestroy() {
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
4 changes: 1 addition & 3 deletions src/guest/renderer/components/AboutMainView/Preferences/Language.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 51,7 @@
},
beforeDestroy() {
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
4 changes: 1 addition & 3 deletions src/guest/renderer/components/AboutMainView/Preferences/PDFViewer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 43,7 @@
},
beforeDestroy() {
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
4 changes: 1 addition & 3 deletions src/guest/renderer/components/AboutMainView/Preferences/SearchEngineProvider.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 50,7 @@
},
beforeDestroy() {
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
Expand Down
4 changes: 1 addition & 3 deletions src/guest/renderer/components/AboutMainView/Preferences/TabConfig.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 49,7 @@
},
beforeDestroy() {
// eslint-disable-next-line no-undef
ipcRenderer.removeAllListeners([
'guest-here-your-data',
]);
ipcRenderer.removeAllListeners('guest-here-your-data');
},
};
</script>
Expand Down
24 changes: 12 additions & 12 deletions src/guest/renderer/router/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 8,41 @@ export default new Router({
{
path: '/',
name: 'about-main',
component: require('components/AboutMainView'),
component: require('../components/AboutMainView'),
},
{
path: '/lulumi',
name: 'about-main-lulumi',
component: require('components/AboutMainView/Lulumi'),
component: require('../components/AboutMainView/Lulumi'),
},
{
path: '/preferences',
component: require('components/AboutMainView/Preferences'),
component: require('../components/AboutMainView/Preferences'),
children: [
{
path: 'search',
name: 'about-main-preferences-search-engine-provider',
component: require('components/AboutMainView/Preferences/SearchEngineProvider'),
component: require('../components/AboutMainView/Preferences/SearchEngineProvider'),
},
{
path: 'homepage',
name: 'about-main-preferences-homepage',
component: require('components/AboutMainView/Preferences/Homepage'),
component: require('../components/AboutMainView/Preferences/Homepage'),
},
{
path: 'pdfViewer',
name: 'about-main-preferences-pdfViewer',
component: require('components/AboutMainView/Preferences/PDFViewer'),
component: require('../components/AboutMainView/Preferences/PDFViewer'),
},
{
path: 'tab',
name: 'about-main-preferences-tab-config',
component: require('components/AboutMainView/Preferences/TabConfig'),
component: require('../components/AboutMainView/Preferences/TabConfig'),
},
{
path: 'language',
name: 'about-main-preferences-language',
component: require('components/AboutMainView/Preferences/Language'),
component: require('../components/AboutMainView/Preferences/Language'),
},
{
path: '',
Expand All @@ -54,22 54,22 @@ export default new Router({
{
path: '/downloads',
name: 'about-main-downloads',
component: require('components/AboutMainView/Downloads'),
component: require('../components/AboutMainView/Downloads'),
},
{
path: '/history',
name: 'about-main-history',
component: require('components/AboutMainView/History'),
component: require('../components/AboutMainView/History'),
},
{
path: '/extensions',
name: 'about-main-extensions',
component: require('components/AboutMainView/Extensions'),
component: require('../components/AboutMainView/Extensions'),
},
{
path: '/newtab',
name: 'about-main-newtab',
component: require('components/AboutMainView/Newtab'),
component: require('../components/AboutMainView/Newtab'),
},
{
path: '*',
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/constants/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 15,5 @@ export default {
lulumiPreloadPath: `${lulumiHelperPath}/preload`,
lulumiPagesPath: `${lulumiHelperPath}/pages`,
lulumiPDFJSPath: `${lulumiHelperPath}/pdfjs`,
lulumiRev: '0bec504e875d5621f3d0ac0a0b495672c033fb39',
lulumiRev: '5c5c40c792f67a1d5303774aca2a3ad25e4d6e7a',
};
8 changes: 3 additions & 5 deletions src/main/js/lib/session.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 134,9 @@ export default {
});

item.on('done', (event, state) => {
ipcMain.removeAllListeners([
'pause-downloads-progress',
'resume-downloads-progress',
'cancel-downloads-progress',
]);
ipcMain.removeAllListeners('pause-downloads-progress');
ipcMain.removeAllListeners('resume-downloads-progress');
ipcMain.removeAllListeners('cancel-downloads-progress');
mainWindow.webContents.send('complete-downloads-progress', {
name: item.getFilename(),
startTime: item.getStartTime(),
Expand Down
8 changes: 2 additions & 6 deletions src/renderer/components/BrowserMainView/Notification.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 160,8 @@
},
beforeDestroy() {
const ipc = this.$electron.ipcRenderer;
ipc.removeAllListeners([
'update-available',
]);
ipc.removeAllListeners([
'request-permission',
]);
ipc.removeAllListeners('update-available');
ipc.removeAllListeners('request-permission');
this.clear();
},
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/router/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 8,7 @@ export default new Router({
{
path: '/',
name: 'browser-main',
component: require('components/BrowserMainView'),
component: require('../components/BrowserMainView'),
},
{
path: '*',
Expand Down
Loading

0 comments on commit f601177

Please sign in to comment.