Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
Madara
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
Madara
Commits
9ef4771b
Commit
9ef4771b
authored
Sep 30, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
1d7fc82c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
41 deletions
+47
-41
index.vue
src/renderer/components/msssage/index.vue
+0
-3
contenteditor.vue
src/renderer/components/tools/contenteditor.vue
+47
-38
No files found.
src/renderer/components/msssage/index.vue
View file @
9ef4771b
...
@@ -456,9 +456,6 @@ export default {
...
@@ -456,9 +456,6 @@ export default {
}
}
},
},
mounted
()
{
mounted
()
{
this
.
MsgBus
.
$on
(
'change-historic'
,
function
(){
console
.
log
(
"asdasd 哈哈哈哈"
)
})
this
.
audio_base
=
this
.
$electron
.
remote
.
getGlobal
(
"AUDIO_PATH"
)
+
'audio/'
this
.
audio_base
=
this
.
$electron
.
remote
.
getGlobal
(
"AUDIO_PATH"
)
+
'audio/'
if
(
window
.
localStorage
.
top
)
{
if
(
window
.
localStorage
.
top
)
{
this
.
TOPSESSION
=
JSON
.
parse
(
window
.
localStorage
.
top
);
this
.
TOPSESSION
=
JSON
.
parse
(
window
.
localStorage
.
top
);
...
...
src/renderer/components/tools/contenteditor.vue
View file @
9ef4771b
...
@@ -244,6 +244,8 @@ export default {
...
@@ -244,6 +244,8 @@ export default {
offMsgBusListener(){
offMsgBusListener(){
this.MsgBus.$off("
send
-
at
-
name
");
this.MsgBus.$off("
send
-
at
-
name
");
this.MsgBus.$off("
new
-
screen
-
hot
");
this.MsgBus.$off("
new
-
screen
-
hot
");
this.$electron.ipcRenderer.removeAllListeners(['new-send-file'])
let _this = this;
},
},
toolPaste: function (e) {
toolPaste: function (e) {
let clipboardData = 1;
let clipboardData = 1;
...
@@ -278,7 +280,6 @@ export default {
...
@@ -278,7 +280,6 @@ export default {
innerHTML: sessionText
innerHTML: sessionText
})
})
}
}
this.MsgBus.$emit('change-historic')
window.localStorage.historicList = JSON.stringify(historicList)
window.localStorage.historicList = JSON.stringify(historicList)
},
},
updateClipboard() {
updateClipboard() {
...
@@ -291,11 +292,9 @@ export default {
...
@@ -291,11 +292,9 @@ export default {
};
};
a.readAsDataURL(blob);
a.readAsDataURL(blob);
},
},
initClip() {
NextClip(event){
console.log(123)
let that = this;
let that = this;
document
.querySelector("
#
msgEditorBox
")
.addEventListener("
paste
", function(event) {
var clipboardData = event.clipboardData;
var clipboardData = event.clipboardData;
var items, item, types;
var items, item, types;
if (clipboardData) {
if (clipboardData) {
...
@@ -331,7 +330,17 @@ export default {
...
@@ -331,7 +330,17 @@ export default {
}
}
}
}
}
}
});
},
initClip() {
let that = this;
document
.querySelector("
#
msgEditorBox
")
.removeEventListener("
paste
", that.NextClip, true);
setTimeout(()=>{
document
.querySelector("
#
msgEditorBox
")
.addEventListener("
paste
", that.NextClip);
}, 20)
},
},
createImage(dataurl){
createImage(dataurl){
var strLen = dataurl.length;
var strLen = dataurl.length;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment