git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.3.1 - Released 11/30/2010
[extjs.git]
/
src
/
core
/
EventManager-more.js
diff --git
a/src/core/EventManager-more.js
b/src/core/EventManager-more.js
index
56ed73f
..
f5a39d2
100644
(file)
--- a/
src/core/EventManager-more.js
+++ b/
src/core/EventManager-more.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
1.0
- * Copyright(c) 2006-20
09 Ext JS, LLC
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.
3.1
+ * Copyright(c) 2006-20
10 Sencha Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
/**
* @class Ext.EventManager
*/
/**
* @class Ext.EventManager
@@
-29,14
+29,14
@@
Ext.apply(Ext.EventManager, function(){
var h = D.getViewHeight(),
w = D.getViewWidth();
var h = D.getViewHeight(),
w = D.getViewWidth();
- //whacky problem in IE where the resize event will fire even though the w/h are the same.
- if(curHeight != h || curWidth != w){
+
//whacky problem in IE where the resize event will fire even though the w/h are the same.
+
if(curHeight != h || curWidth != w){
resizeEvent.fire(curWidth = w, curHeight = h);
resizeEvent.fire(curWidth = w, curHeight = h);
- }
+
}
},
/**
},
/**
- * Adds a listener to be notified when the browser window is resized and provides resize event buffering (
5
0 milliseconds),
+ * Adds a listener to be notified when the browser window is resized and provides resize event buffering (
10
0 milliseconds),
* passes new viewport width and height to handlers.
* @param {Function} fn The handler function the window resize event invokes.
* @param {Object} scope The scope (<code>this</code> reference) in which the handler function executes. Defaults to the browser window.
* passes new viewport width and height to handlers.
* @param {Function} fn The handler function the window resize event invokes.
* @param {Object} scope The scope (<code>this</code> reference) in which the handler function executes. Defaults to the browser window.
@@
-54,11
+54,7
@@
Ext.apply(Ext.EventManager, function(){
// exposed only to allow manual firing
fireWindowResize : function(){
if(resizeEvent){
// exposed only to allow manual firing
fireWindowResize : function(){
if(resizeEvent){
- if((Ext.isIE||Ext.isAir) && resizeTask){
- resizeTask.delay(50);
- }else{
- resizeEvent.fire(D.getViewWidth(), D.getViewHeight());
- }
+ resizeTask.delay(100);
}
},
}
},
@@
-112,6
+108,11
@@
Ext.apply(Ext.EventManager, function(){
* Url used for onDocumentReady with using SSL (defaults to Ext.SSL_SECURE_URL)
*/
ieDeferSrc : false,
* Url used for onDocumentReady with using SSL (defaults to Ext.SSL_SECURE_URL)
*/
ieDeferSrc : false,
+
+ // protected, short accessor for useKeydown
+ getKeyEvent : function(){
+ return useKeydown ? 'keydown' : 'keypress';
+ },
// protected for use inside the framework
// detects whether we should use keydown or keypress based on the browser.
// protected for use inside the framework
// detects whether we should use keydown or keypress based on the browser.
@@
-317,7
+318,7
@@
Ext.apply(Ext.EventObjectImpl.prototype, {
this.isNavKeyPress() ||
(k == this.BACKSPACE) || // Backspace
(k >= 16 && k <= 20) || // Shift, Ctrl, Alt, Pause, Caps Lock
this.isNavKeyPress() ||
(k == this.BACKSPACE) || // Backspace
(k >= 16 && k <= 20) || // Shift, Ctrl, Alt, Pause, Caps Lock
- (k >= 44 && k <= 4
5); // Print Screen, Insert
+ (k >= 44 && k <= 4
6); // Print Screen, Insert, Delete
},
getPoint : function(){
},
getPoint : function(){