Skip to content
This repository was archived by the owner on Jul 29, 2019. It is now read-only.

Fix pan issue #657 #2617

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Fix pan issue #657 #2617

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
20ff5cb
add paning items near edges feature
mosheDa Jan 17, 2017
2fd5027
support rtl
mosheDa Jan 17, 2017
c0b92ff
support move limit
mosheDa Jan 17, 2017
7fddcb6
move event listeners from core.js
mosheDa Jan 18, 2017
200be5a
fix stop move when pan came back from outside
mosheDa Jan 19, 2017
bfd8306
clean up code
mosheDa Jan 23, 2017
3a97f28
rename left an d right zones
mosheDa Mar 7, 2017
8d23d64
move mouseLocation properties into touchParams object
mosheDa Mar 7, 2017
0c13c5f
use this instead 'context'
mosheDa Mar 7, 2017
1ff2ba0
Merge branch 'develop' into fix_pan_issue
yotamberk Mar 20, 2017
d64a3e8
Merge branch 'develop' into fix_pan_issue
yotamberk Apr 6, 2017
5d453f0
Merge branch 'develop' into fix_pan_issue
yotamberk May 13, 2017
61f8059
Merge branch 'develop' into fix_pan_issue
wimrijnders Jul 3, 2017
9e9bc9a
Merge branch 'develop' into fix_pan_issue
wimrijnders Jul 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support rtl
  • Loading branch information
@mosheDa
mosheDa committed Jan 17, 2017
commit 2fd5027d365f0728f506525429c4ccb282e171a2
43 changes: 25 additions & 18 deletions lib/timeline/component/ItemSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,16 +1434,18 @@ ItemSet.prototype._onDrag = function (event) {
var interval = end - start;

var distance = (interval * 2) / 100;
// console.log("drag on")

if(this.body.mouseLocation.mouseOnLeft){
var newStart = start - distance;
var newEnd = end - distance;
}
else{
if ((this.options.rtl && this.body.mouseLocation.mouseOnLeft)||
(!this.options.rtl && this.body.mouseLocation.mouseOnRight))
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for new line

var newStart = start + distance;
var newEnd = end + distance;
}
else
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brackets don't need a new line. should be } else {

var newStart = start - distance;
var newEnd = end - distance;
}

this.body.range._applyRange(newStart, newEnd);

Expand Down Expand Up @@ -1557,19 +1559,24 @@ ItemSet.prototype._onDrag = function (event) {
// moshe's code


if(this.body.mouseLocation.mouseOnLeft || this.body.mouseLocation.mouseOnRight){
var range = this.body.getWindow();
var windowStart = range.start.valueOf();
var windowEnd = range.end.valueOf();

if(this.body.mouseLocation.mouseOnLeft){

start = windowStart;
} else {
var itemWidth = props.item.data.end.valueOf() - props.item.data.start.valueOf();
start = windowEnd - itemWidth;
if(this.body.mouseLocation.mouseOnLeft || this.body.mouseLocation.mouseOnRight){
var range = this.body.getWindow();
var windowStart = range.start.valueOf();
var windowEnd = range.end.valueOf();


if ((this.options.rtl && this.body.mouseLocation.mouseOnLeft)||
(!this.options.rtl && this.body.mouseLocation.mouseOnRight))
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for new line

var itemWidth = props.item.data.end.valueOf() - props.item.data.start.valueOf();
start = windowEnd - itemWidth;


} else
{
start = windowStart;
}
}
}

//

Expand Down