Commit fd74aa04 authored by campaign's avatar campaign

修复在ff下定位到文字后方空格光标不移动问题

parent e04fd272
...@@ -16,6 +16,7 @@ $dependency = Array( ...@@ -16,6 +16,7 @@ $dependency = Array(
,'src/core/keymap.js' ,'src/core/keymap.js'
,'src/core/minder.lang.js' ,'src/core/minder.lang.js'
,'src/core/minder.defaultoptions.js' ,'src/core/minder.defaultoptions.js'
,'src/core/browser.js'
,'src/module/geometry.js' ,'src/module/geometry.js'
,'src/module/history.js' ,'src/module/history.js'
,'src/module/icon.js' ,'src/module/icon.js'
......
...@@ -22,7 +22,7 @@ Minder.Receiver = kity.createClass('Receiver',{ ...@@ -22,7 +22,7 @@ Minder.Receiver = kity.createClass('Receiver',{
_div.setAttribute('contenteditable',true); _div.setAttribute('contenteditable',true);
_div.className = 'km_receiver'; _div.className = 'km_receiver';
this.container = document.body.insertBefore(_div,document.body.firstChild); this.container = document.body.insertBefore(_div,document.body.firstChild);
utils.addCssRule('km_receiver_css',' .km_receiver{position:absolute;padding:0;margin:0;word-wrap:break-word;clip:rect(1em 1em 1em 1em);}');// utils.addCssRule('km_receiver_css',' .km_receiver{position:absolute;padding:0;margin:0;word-wrap:break-word;');//clip:rect(1em 1em 1em 1em);}
this.km.on('textedit.beforekeyup textedit.keydown textedit.paste', utils.proxy(this.keyboardEvents,this)); this.km.on('textedit.beforekeyup textedit.keydown textedit.paste', utils.proxy(this.keyboardEvents,this));
this.timer = null; this.timer = null;
this.index = 0; this.index = 0;
...@@ -81,6 +81,10 @@ Minder.Receiver = kity.createClass('Receiver',{ ...@@ -81,6 +81,10 @@ Minder.Receiver = kity.createClass('Receiver',{
if(me.textShape.getOpacity() == 0){ if(me.textShape.getOpacity() == 0){
me.textShape.setOpacity(1); me.textShape.setOpacity(1);
} }
//#46 修复在ff下定位到文字后方空格光标不移动问题
if(browser.gecko && /\s$/.test(text)){
text += "\u200b";
}
me.textShape.setContent(text); me.textShape.setContent(text);
me.setContainerStyle(); me.setContainerStyle();
me.minderNode.setText(text); me.minderNode.setText(text);
...@@ -216,7 +220,12 @@ Minder.Receiver = kity.createClass('Receiver',{ ...@@ -216,7 +220,12 @@ Minder.Receiver = kity.createClass('Receiver',{
this.textData = []; this.textData = [];
for(var i= 0,l = text.length;i<l;i++){ for(var i= 0,l = text.length;i<l;i++){
var box = this.textShape.getExtentOfChar(i); try{
var box = this.textShape.getExtentOfChar(i);
}catch(e){
debugger
}
this.textData.push({ this.textData.push({
x:box.x + this.offset.x, x:box.x + this.offset.x,
y:this.offset.y, y:this.offset.y,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment