Skip to content

Commit

Permalink
Fix(tinymce): redo changes accidentally removed by merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Armour committed Nov 2, 2020
1 parent f5cd4c4 commit 955439d
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 1,026 deletions.
5 changes: 1 addition & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
module.exports = {
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel',
transform: {
'^.+\\.vue$': 'vue-jest'
}
preset: '@vue/cli-plugin-unit-jest/presets/typescript-and-babel'
}
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@
"@vue/eslint-config-standard": "^5.1.2",
"@vue/eslint-config-typescript": "^7.0.0",
"@vue/test-utils": "^1.1.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"concurrently": "^5.3.0",
"eslint": "^7.12.1",
Expand All @@ -100,7 +98,6 @@
"eslint-plugin-standard": "^4.0.2",
"eslint-plugin-vue": "^7.1.0",
"fibers": "^5.0.0",
"jest": "^26.6.1",
"lint-staged": "^10.5.1",
"sass": "^1.28.0",
"sass-loader": "^10.0.4",
Expand Down
5 changes: 4 additions & 1 deletion src/components/Tinymce/components/EditorImage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
>
upload
</el-button>
<el-dialog :visible.sync="dialogVisible">
<el-dialog
:visible.sync="dialogVisible"
:modal-append-to-body="false"
>
<el-upload
:multiple="true"
:file-list="defaultFileList"
Expand Down
9 changes: 5 additions & 4 deletions src/components/Tinymce/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,12 @@ export default class extends Vue {
position: absolute;
right: 6px;
top: 6px;
z-index: 1002;
}
&.fullscreen {
z-index: 10000;
position: fixed;
}
.fullscreen .editor-custom-btn-container {
z-index: 10000;
position: fixed;
}
.editor-upload-btn {
Expand Down
Loading

0 comments on commit 955439d

Please sign in to comment.