Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
db514073
Commit
db514073
authored
Jul 29, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input context scroll in chrome
parent
08ec5192
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
11 deletions
+27
-11
common/text_input.js
common/text_input.js
+22
-11
slide/Drawing/HtmlPage.js
slide/Drawing/HtmlPage.js
+3
-0
word/Drawing/HtmlPage.js
word/Drawing/HtmlPage.js
+2
-0
No files found.
common/text_input.js
View file @
db514073
...
@@ -144,6 +144,10 @@
...
@@ -144,6 +144,10 @@
// поэтому учитываем только update, заодно запоминаем дату на старте (только для ие)
// поэтому учитываем только update, заодно запоминаем дату на старте (только для ие)
this
.
isChromeKeysNoKeyPressPresent
=
false
;
this
.
isChromeKeysNoKeyPressPresent
=
false
;
this
.
isChromeKeysNoKeyPressPresentStartValue
=
""
;
this
.
isChromeKeysNoKeyPressPresentStartValue
=
""
;
// chrome element for left/top
this
.
FixedPosCheckElementX
=
0
;
this
.
FixedPosCheckElementY
=
0
;
}
}
CTextInput
.
prototype
=
CTextInput
.
prototype
=
...
@@ -158,8 +162,13 @@
...
@@ -158,8 +162,13 @@
this
.
HtmlDiv
.
id
=
"
area_id_parent
"
;
this
.
HtmlDiv
.
id
=
"
area_id_parent
"
;
this
.
HtmlDiv
.
style
.
background
=
"
transparent
"
;
this
.
HtmlDiv
.
style
.
background
=
"
transparent
"
;
this
.
HtmlDiv
.
style
.
border
=
"
none
"
;
this
.
HtmlDiv
.
style
.
border
=
"
none
"
;
// в хроме скроллируется редактор, когда курсор текстового поля выходит за пределы окна
if
(
AscCommon
.
AscBrowser
.
isChrome
)
this
.
HtmlDiv
.
style
.
position
=
"
fixed
"
;
else
this
.
HtmlDiv
.
style
.
position
=
"
absolute
"
;
this
.
HtmlDiv
.
style
.
position
=
"
absolute
"
;
this
.
HtmlDiv
.
style
.
zIndex
=
0
;
this
.
HtmlDiv
.
style
.
zIndex
=
1
0
;
this
.
HtmlDiv
.
style
.
width
=
"
20px
"
;
this
.
HtmlDiv
.
style
.
width
=
"
20px
"
;
this
.
HtmlDiv
.
style
.
height
=
"
50px
"
;
this
.
HtmlDiv
.
style
.
height
=
"
50px
"
;
this
.
HtmlDiv
.
style
.
overflow
=
"
hidden
"
;
this
.
HtmlDiv
.
style
.
overflow
=
"
hidden
"
;
...
@@ -180,7 +189,7 @@
...
@@ -180,7 +189,7 @@
this
.
HtmlArea
.
id
=
"
area_id
"
;
this
.
HtmlArea
.
id
=
"
area_id
"
;
var
_style
=
"
left:0px;top:
"
+
(
-
this
.
HtmlAreaOffset
)
+
"
px;
"
;
var
_style
=
"
left:0px;top:
"
+
(
-
this
.
HtmlAreaOffset
)
+
"
px;
"
;
_style
+=
"
background:transparent;border:none;position:absolute;text-shadow:0 0 0 #000;outline:none;color:transparent;width:100
%;height:100%
;
"
;
_style
+=
"
background:transparent;border:none;position:absolute;text-shadow:0 0 0 #000;outline:none;color:transparent;width:100
0px;height:50px
;
"
;
_style
+=
"
overflow:hidden;padding:0px;margin:0px;font-family:arial;font-size:12pt;resize:none;font-weight:normal;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;
"
;
_style
+=
"
overflow:hidden;padding:0px;margin:0px;font-family:arial;font-size:12pt;resize:none;font-weight:normal;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;
"
;
this
.
HtmlArea
.
setAttribute
(
"
style
"
,
_style
);
this
.
HtmlArea
.
setAttribute
(
"
style
"
,
_style
);
this
.
HtmlArea
.
setAttribute
(
"
spellcheck
"
,
false
);
this
.
HtmlArea
.
setAttribute
(
"
spellcheck
"
,
false
);
...
@@ -270,6 +279,13 @@
...
@@ -270,6 +279,13 @@
var
_elem
=
document
.
getElementById
(
"
area_id_main
"
);
var
_elem
=
document
.
getElementById
(
"
area_id_main
"
);
var
_elemSrc
=
document
.
getElementById
(
_editorContainerId
);
var
_elemSrc
=
document
.
getElementById
(
_editorContainerId
);
if
(
AscCommon
.
AscBrowser
.
isChrome
)
{
var
rectObject
=
_elemSrc
.
getBoundingClientRect
();
this
.
FixedPosCheckElementX
=
rectObject
.
left
;
this
.
FixedPosCheckElementY
=
rectObject
.
top
;
}
var
_width
=
_elemSrc
.
style
.
width
;
var
_width
=
_elemSrc
.
style
.
width
;
if
((
null
==
_width
||
""
==
_width
)
&&
window
.
getComputedStyle
)
if
((
null
==
_width
||
""
==
_width
)
&&
window
.
getComputedStyle
)
{
{
...
@@ -303,21 +319,16 @@
...
@@ -303,21 +319,16 @@
var
xPos
=
x
?
x
:
parseInt
(
oTarget
.
style
.
left
);
var
xPos
=
x
?
x
:
parseInt
(
oTarget
.
style
.
left
);
var
yPos
=
(
y
?
y
:
parseInt
(
oTarget
.
style
.
top
))
+
parseInt
(
oTarget
.
style
.
height
);
var
yPos
=
(
y
?
y
:
parseInt
(
oTarget
.
style
.
top
))
+
parseInt
(
oTarget
.
style
.
height
);
/*
if
(
!
this
.
isDebug
&&
!
this
.
isSystem
)
if
(
!
this
.
isDebug
&&
!
this
.
isSystem
)
{
{
this.HtmlDiv.style.left = xPos + "px";
this
.
HtmlDiv
.
style
.
left
=
xPos
+
this
.
FixedPosCheckElementX
+
"
px
"
;
this.HtmlDiv.style.top = yPos + this.HtmlAreaOffset + "px";
this
.
HtmlDiv
.
style
.
top
=
yPos
+
this
.
FixedPosCheckElementY
+
this
.
HtmlAreaOffset
+
"
px
"
;
}
}
else
else
{
{
// this.HtmlAreaOffset - не сдвигаем, курсор должен быть виден
// this.HtmlAreaOffset - не сдвигаем, курсор должен быть виден
this.debugCalculatePlace(xPos
, yPos
);
this
.
debugCalculatePlace
(
xPos
+
this
.
FixedPosCheckElementX
,
yPos
+
this
.
FixedPosCheckElementY
);
}
}
*/
if
(
!
this
.
isDebug
&&
!
this
.
isSystem
)
yPos
+=
this
.
HtmlAreaOffset
;
this
.
debugCalculatePlace
(
xPos
,
yPos
);
},
},
putAreaValue
:
function
(
val
)
putAreaValue
:
function
(
val
)
...
...
slide/Drawing/HtmlPage.js
View file @
db514073
...
@@ -3033,6 +3033,9 @@ function CEditorPage(api)
...
@@ -3033,6 +3033,9 @@ function CEditorPage(api)
this
.
m_oApi
.
syncOnThumbnailsShow
();
this
.
m_oApi
.
syncOnThumbnailsShow
();
AscCommon
.
InitBrowserInputContext
(
this
.
m_oApi
,
"
id_target_cursor
"
);
AscCommon
.
InitBrowserInputContext
(
this
.
m_oApi
,
"
id_target_cursor
"
);
if
(
AscCommon
.
g_inputContext
)
AscCommon
.
g_inputContext
.
onResize
(
"
id_main_view
"
);
};
};
this
.
StartMainTimer
=
function
()
this
.
StartMainTimer
=
function
()
...
...
word/Drawing/HtmlPage.js
View file @
db514073
...
@@ -3585,6 +3585,8 @@ function CEditorPage(api)
...
@@ -3585,6 +3585,8 @@ function CEditorPage(api)
}
}
AscCommon
.
InitBrowserInputContext
(
this
.
m_oApi
,
"
id_target_cursor
"
);
AscCommon
.
InitBrowserInputContext
(
this
.
m_oApi
,
"
id_target_cursor
"
);
if
(
AscCommon
.
g_inputContext
)
AscCommon
.
g_inputContext
.
onResize
(
"
id_main_view
"
);
//this.m_oDrawingDocument.CheckFontCache();
//this.m_oDrawingDocument.CheckFontCache();
};
};
...
...
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