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
fe391962
Commit
fe391962
authored
Feb 15, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mobile version (web)
parent
388697eb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
7 deletions
+18
-7
cell/view/mobileTouch.js
cell/view/mobileTouch.js
+12
-3
common/Scrolls/mobileTouchManagerBase.js
common/Scrolls/mobileTouchManagerBase.js
+1
-1
slide/Drawing/mobileTouchManager.js
slide/Drawing/mobileTouchManager.js
+3
-2
word/Drawing/mobileTouchManager.js
word/Drawing/mobileTouchManager.js
+2
-1
No files found.
cell/view/mobileTouch.js
View file @
fe391962
...
@@ -220,6 +220,11 @@ function (window, undefined)
...
@@ -220,6 +220,11 @@ function (window, undefined)
return
_mode
;
return
_mode
;
};
};
CMobileDelegateEditorCell
.
prototype
.
IsInObject
=
function
()
{
var
_controller
=
this
.
WB
.
getWorksheet
().
objectRender
.
controller
;
return
(
null
!=
_controller
.
getSelectedObjectsBounds
(
true
));
};
CMobileDelegateEditorCell
.
prototype
.
GetContextMenuInfo
=
function
(
info
)
CMobileDelegateEditorCell
.
prototype
.
GetContextMenuInfo
=
function
(
info
)
{
{
info
.
Clear
();
info
.
Clear
();
...
@@ -408,7 +413,7 @@ function (window, undefined)
...
@@ -408,7 +413,7 @@ function (window, undefined)
}
}
var
_object_bounds
=
_controller
.
getSelectedObjectsBounds
(
true
);
var
_object_bounds
=
_controller
.
getSelectedObjectsBounds
(
true
);
if
(
(
0
==
_mode
||
2
==
_mode
)
&&
_object_bounds
)
if
(
_object_bounds
)
{
{
_pos
=
this
.
ConvertCoordsToCursor
(
_object_bounds
.
minX
,
_object_bounds
.
minY
,
_object_bounds
.
pageIndex
);
_pos
=
this
.
ConvertCoordsToCursor
(
_object_bounds
.
minX
,
_object_bounds
.
minY
,
_object_bounds
.
pageIndex
);
_posX
=
_pos
.
X
;
_posX
=
_pos
.
X
;
...
@@ -858,7 +863,8 @@ function (window, undefined)
...
@@ -858,7 +863,8 @@ function (window, undefined)
this
.
Api
.
sendEvent
(
"
asc_onTapEvent
"
,
e
);
this
.
Api
.
sendEvent
(
"
asc_onTapEvent
"
,
e
);
var
typeMenu
=
this
.
delegate
.
GetContextMenuType
();
var
typeMenu
=
this
.
delegate
.
GetContextMenuType
();
if
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Target
)
if
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Target
||
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Select
&&
this
.
delegate
.
IsInObject
()))
isPreventDefault
=
false
;
isPreventDefault
=
false
;
}
}
else
else
...
@@ -924,10 +930,13 @@ function (window, undefined)
...
@@ -924,10 +930,13 @@ function (window, undefined)
this
.
delegate
.
Api
.
controller
.
_onMouseMove
(
_e
);
this
.
delegate
.
Api
.
controller
.
_onMouseMove
(
_e
);
}
}
if
(
this
.
CellEditorType
==
Asc
.
c_oAscCellEditorState
.
editFormula
)
isPreventDefault
=
false
;
if
(
this
.
Api
.
isViewMode
||
isPreventDefault
)
if
(
this
.
Api
.
isViewMode
||
isPreventDefault
)
AscCommon
.
g_inputContext
.
preventVirtualKeyboard
(
e
);
AscCommon
.
g_inputContext
.
preventVirtualKeyboard
(
e
);
if
(
true
!==
this
.
iScroll
.
isAnimating
)
if
(
true
!==
this
.
iScroll
.
isAnimating
&&
(
this
.
CellEditorType
!=
Asc
.
c_oAscCellEditorState
.
editFormula
)
)
this
.
CheckContextMenuTouchEnd
(
isCheckContextMenuMode
,
isCheckContextMenuSelect
,
isCheckContextMenuCursor
);
this
.
CheckContextMenuTouchEnd
(
isCheckContextMenuMode
,
isCheckContextMenuSelect
,
isCheckContextMenuCursor
);
return
false
;
return
false
;
...
...
common/Scrolls/mobileTouchManagerBase.js
View file @
fe391962
...
@@ -436,7 +436,7 @@
...
@@ -436,7 +436,7 @@
}
}
var
_object_bounds
=
this
.
LogicDocument
.
DrawingObjects
.
getSelectedObjectsBounds
(
true
);
var
_object_bounds
=
this
.
LogicDocument
.
DrawingObjects
.
getSelectedObjectsBounds
(
true
);
if
(
(
0
==
_mode
||
2
==
_mode
)
&&
_object_bounds
)
if
(
_object_bounds
)
{
{
_pos
=
this
.
DrawingDocument
.
ConvertCoordsToCursorWR
(
_object_bounds
.
minX
,
_object_bounds
.
minY
,
_object_bounds
.
pageIndex
);
_pos
=
this
.
DrawingDocument
.
ConvertCoordsToCursorWR
(
_object_bounds
.
minX
,
_object_bounds
.
minY
,
_object_bounds
.
pageIndex
);
_posX
=
_pos
.
X
;
_posX
=
_pos
.
X
;
...
...
slide/Drawing/mobileTouchManager.js
View file @
fe391962
...
@@ -321,7 +321,7 @@
...
@@ -321,7 +321,7 @@
}
}
var
_object_bounds
=
_controller
.
getSelectedObjectsBounds
(
true
);
var
_object_bounds
=
_controller
.
getSelectedObjectsBounds
(
true
);
if
(
(
0
==
_mode
||
2
==
_mode
)
&&
_object_bounds
)
if
(
_object_bounds
)
{
{
_pos
=
this
.
DrawingDocument
.
ConvertCoordsToCursorWR
(
_object_bounds
.
minX
,
_object_bounds
.
minY
,
_object_bounds
.
pageIndex
);
_pos
=
this
.
DrawingDocument
.
ConvertCoordsToCursorWR
(
_object_bounds
.
minX
,
_object_bounds
.
minY
,
_object_bounds
.
pageIndex
);
_posX
=
_pos
.
X
;
_posX
=
_pos
.
X
;
...
@@ -799,7 +799,8 @@
...
@@ -799,7 +799,8 @@
this
.
Api
.
sendEvent
(
"
asc_onTapEvent
"
,
e
);
this
.
Api
.
sendEvent
(
"
asc_onTapEvent
"
,
e
);
var
typeMenu
=
this
.
delegate
.
GetContextMenuType
();
var
typeMenu
=
this
.
delegate
.
GetContextMenuType
();
if
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Target
)
if
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Target
||
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Select
)
isPreventDefault
=
false
;
isPreventDefault
=
false
;
}
}
else
else
...
...
word/Drawing/mobileTouchManager.js
View file @
fe391962
...
@@ -496,7 +496,8 @@
...
@@ -496,7 +496,8 @@
this
.
Api
.
sendEvent
(
"
asc_onTapEvent
"
,
e
);
this
.
Api
.
sendEvent
(
"
asc_onTapEvent
"
,
e
);
var
typeMenu
=
this
.
delegate
.
GetContextMenuType
();
var
typeMenu
=
this
.
delegate
.
GetContextMenuType
();
if
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Target
)
if
(
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Target
||
typeMenu
==
AscCommon
.
MobileTouchContextMenuType
.
Select
)
isPreventDefault
=
false
;
isPreventDefault
=
false
;
}
}
else
else
...
...
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