Skip to content

Fix for the bug: [OPEN-342] Bug with single-click - reproducible in 1.5.1 #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
satishkn wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix for the bug: [OPEN-342] Bug with single-click - reproducible in 1.5.1 #57

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3592cbb
Fix for the follwoing bug:
satishkn Mar 23, 2013
7f76d49
Fix for the following bug:
satishkn Mar 25, 2013
56755f8
Merge branch 'master' of github.com:satishkn/Extensible
satishkn Mar 25, 2013
7c31200
Formatting changes..
satishkn Mar 25, 2013
6768897
Formatting changes.
satishkn Mar 25, 2013
4937f26
Implementation for passthrough of doubleclick event so the user can …
satishkn Mar 26, 2013
d6c0852
Implementation for the bug:
satishkn Mar 27, 2013
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
19 changes: 16 additions & 3 deletions src/calendar/view/AbstractCalendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ Ext.define('Extensible.calendar.view.AbstractCalendar', {

requires: [
'Ext.CompositeElement',
'Ext.EventObject',
'Extensible.calendar.form.EventDetails',
'Extensible.calendar.form.EventWindow',
'Extensible.calendar.menu.Event',
'Extensible.calendar.dd.DragZone',
'Extensible.calendar.dd.DropZone',
'Extensible.form.recurrence.RangeEditWindow'
],
Copy link
Copy Markdown
Owner

@bmoeskau bmoeskau Mar 25, 2013

Choose a reason for hiding this comment

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

Please discard whitespace-only changes prior to committing




/**
* @cfg {Ext.data.Store} eventStore
* The {@link Ext.data.Store store} which is bound to this calendar and contains {@link Extensible.calendar.data.EventModel EventRecords}.
Expand Down Expand Up @@ -570,6 +572,8 @@ viewConfig: {

this.on('resize', this.onResize, this);

Ext.getBody().on('keyup', this.onKeyUp, this);

this.el.on({
'mouseover': this.onMouseOver,
'mouseout': this.onMouseOut,
Expand Down Expand Up @@ -1878,7 +1882,8 @@ Ext.override(Extensible.calendar.view.AbstractCalendar, {
}

me.eventMenu.showForEvent(me.getEventRecordFromEl(el), el, xy);
me.menuActive = true;
me.menuActive = true;

Copy link
Copy Markdown
Owner

@bmoeskau bmoeskau Mar 25, 2013

Choose a reason for hiding this comment

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

Same thing, this line is just whitespace

},

// private
Expand Down Expand Up @@ -2076,7 +2081,8 @@ Ext.override(Extensible.calendar.view.AbstractCalendar, {
// ignore the first click if a context menu is active (let it close)
me.menuActive = false;
return true;
}
}

Copy link
Copy Markdown
Owner

@bmoeskau bmoeskau Mar 25, 2013

Choose a reason for hiding this comment

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

Same thing

if (el) {
var id = me.getEventIdFromEl(el),
rec = me.getEventRecord(id);
Expand Down Expand Up @@ -2108,6 +2114,13 @@ Ext.override(Extensible.calendar.view.AbstractCalendar, {
}
},

// private
onKeyUp: function(e, t) {
if (e.getCharCode( ) === Ext.EventObject.ESC) {
this.menuActive = false;
}
},

// private
Copy link
Copy Markdown
Owner

@bmoeskau bmoeskau Mar 25, 2013

Choose a reason for hiding this comment

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

Looks good, but please stick to 4-char indentation for consistency with the existing code.

handleEventMouseEvent: function(e, t, type) {
var el = e.getTarget(this.eventSelector, this.eventSelectorDepth, true);
Expand Down