chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-04-20 03:15:47 +02:00
Code

Disable custom emoji input, fix selection handling and support twemoji font if installed

Browse Source
This commit is contained in:
chylex 2017-08-21 13:37:21 +02:00
parent 77b5c95f75
commit 017f883e0b
1 changed files with 34 additions and 12 deletions

46
Resources/Plugins/emoji-keyboard/browser.js
View File

@ -1,4 +1,6 @@
enabled(){ enabled(){
this.ENABLE_CUSTOM_KEYBOARD = false;
this.selectedSkinTone = ""; this.selectedSkinTone = "";
this.currentKeywords = []; this.currentKeywords = [];
@ -50,6 +52,8 @@ enabled(){
this.css.insert(".js-docked-compose .compose-text-container.td-emoji-keyboard-swap .js-compose-text { position: absolute; z-index: -9999; left: 0; opacity: 0 }"); this.css.insert(".js-docked-compose .compose-text-container.td-emoji-keyboard-swap .js-compose-text { position: absolute; z-index: -9999; left: 0; opacity: 0 }");
this.css.insert(".compose-text-container:not(.td-emoji-keyboard-swap) #emoji-keyboard-tweet-input { display: none; }"); this.css.insert(".compose-text-container:not(.td-emoji-keyboard-swap) #emoji-keyboard-tweet-input { display: none; }");
this.css.insert(".js-compose-text { font-family: \"Twitter Color Emoji\", Helvetica, Arial, Verdana, sans-serif; }");
// layout // layout
var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--9 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>'; var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--9 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
@ -225,13 +229,29 @@ enabled(){
}; };
var insertEmoji = (src, alt) => { var insertEmoji = (src, alt) => {
replaceEditor(true); if (this.ENABLE_CUSTOM_KEYBOARD){
replaceEditor(true);
if (!hasSelectionInEditor()){
focusWithCaretAtEnd(); if (!hasSelectionInEditor()){
focusWithCaretAtEnd();
}
document.execCommand("insertHTML", false, `<img src="${src}" alt="${alt}">`);
}
else{
let input = $(".js-compose-text", ".js-docked-compose");
let val = input.val();
let posStart = input[0].selectionStart;
let posEnd = input[0].selectionEnd;
input.val(val.slice(0, posStart)+alt+val.slice(posEnd));
input.trigger("change");
input.focus();
input[0].selectionStart = posStart+alt.length;
input[0].selectionEnd = posStart+alt.length;
} }
document.execCommand("insertHTML", false, `<img src="${src}" alt="${alt}">`);
}; };
// general event handlers // general event handlers
@ -278,7 +298,7 @@ enabled(){
} }
}; };
// editor event handlers // new editor event handlers
var prevOldInputVal = ""; var prevOldInputVal = "";
var isEditorActive = false; var isEditorActive = false;
@ -438,11 +458,13 @@ ready(){
this.composeInputOrig = $(".js-compose-text", ".js-docked-compose").first(); this.composeInputOrig = $(".js-compose-text", ".js-docked-compose").first();
this.composeInputNew = $('<div id="emoji-keyboard-tweet-input" contenteditable="true" class="compose-text txt-size--14 scroll-v scroll-styled-v scroll-styled-h scroll-alt td-detect-image-paste"></div>').insertAfter(this.composeInputOrig); this.composeInputNew = $('<div id="emoji-keyboard-tweet-input" contenteditable="true" class="compose-text txt-size--14 scroll-v scroll-styled-v scroll-styled-h scroll-alt td-detect-image-paste"></div>').insertAfter(this.composeInputOrig);
this.composeInputOrig.on("focus", this.composeOldInputFocusEvent); if (this.ENABLE_CUSTOM_KEYBOARD){
this.composeInputOrig.on("focus", this.composeOldInputFocusEvent);
this.composeInputNew.on("keydown keypress keyup", this.composeInputKeyEvent);
this.composeInputNew.on("input", this.composeInputUpdateEvent); this.composeInputNew.on("keydown keypress keyup", this.composeInputKeyEvent);
this.composeInputNew.on("paste", this.composeInputPasteEvent); this.composeInputNew.on("input", this.composeInputUpdateEvent);
this.composeInputNew.on("paste", this.composeInputPasteEvent);
}
// HTML generation // HTML generation