Skip to content

Commit 7e4b4ea

Browse files
BenjaminHardingBenjaminHarding
committed
Changed Kiwi.Plugins declaration to be a module so that plugins can better have typescript definition files. Issue #208 
1 parent 5413dcd commit 7e4b4ea

5 files changed

Lines changed: 47 additions & 27 deletions

File tree

‎build/kiwi.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23895,7 +23895,8 @@ declare module Kiwi {
2389523895
*/
2389623896
static total(): number;
2389723897
}
23898-
var Plugins: {};
23898+
module Plugins {
23899+
}
2389923900
var extend: Function;
2390023901
}
2390123902
/**

‎build/kiwi.js‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20190,7 +20190,10 @@ var Kiwi;
2019020190
if (Kiwi.DEVICE.pointerEnabled) {
2019120191
var pointerUp = 'pointerup', pointerDown = 'pointerdown', pointerEnter = 'pointerenter', pointerLeave = 'pointerleave', pointerCancel = 'pointercancel', pointerMove = 'pointermove';
2019220192
//Is it IE 10?
20193-
if ((window.navigator.msPointerEnabled)) {
20193+
if (window["PointerEvent"]) {
20194+
}
20195+
else if ((window["MSPointerEvent"])) {
20196+
// IE10 compatibility
2019420197
var pointerUp = 'MSPointerUp', pointerDown = 'MSPointerDown', pointerEnter = 'MSPointerEnter', pointerLeave = 'MSPointerLeave', pointerCancel = 'MSPointerCancel', pointerMove = 'MSPointerMove';
2019520198
}
2019620199
this._onTouchStartBind = this.onPointerStart.bind(this);
@@ -20521,7 +20524,7 @@ var Kiwi;
2052120524
* @private
2052220525
*/
2052320526
Touch.prototype.onPointerStart = function (event) {
20524-
if (event.type === 'touch') {
20527+
if (event.type === 'touch' || event.type === "pointerdown") {
2052520528
this._registerFinger(event, event.pointerId);
2052620529
}
2052720530
};
@@ -20532,7 +20535,7 @@ var Kiwi;
2053220535
* @private
2053320536
*/
2053420537
Touch.prototype.onPointerCancel = function (event) {
20535-
if (event.type === 'touch') {
20538+
if (event.type === 'touch' || event.type === "pointercancel") {
2053620539
this._cancelFinger(event, event.pointerId);
2053720540
}
2053820541
};
@@ -20543,7 +20546,7 @@ var Kiwi;
2054320546
* @private
2054420547
*/
2054520548
Touch.prototype.onPointerEnter = function (event) {
20546-
if (event.type === 'touch') {
20549+
if (event.type === 'touch' || event.type === "pointerenter") {
2054720550
this._enterFinger(event, event.pointerId);
2054820551
}
2054920552
};
@@ -20554,7 +20557,7 @@ var Kiwi;
2055420557
* @private
2055520558
*/
2055620559
Touch.prototype.onPointerLeave = function (event) {
20557-
if (event.type === 'touch') {
20560+
if (event.type === 'touch' || event.type === "pointerleave") {
2055820561
this._leaveFinger(event, event.pointerId);
2055920562
}
2056020563
};
@@ -20564,7 +20567,7 @@ var Kiwi;
2056420567
* @param event {PointerEvent}
2056520568
*/
2056620569
Touch.prototype.onPointerMove = function (event) {
20567-
if (event.type === 'touch') {
20570+
if (event.type === 'touch' || event.type === "pointermove") {
2056820571
this._moveFinger(event, event.pointerId);
2056920572
}
2057020573
};
@@ -20575,7 +20578,7 @@ var Kiwi;
2057520578
* @private
2057620579
*/
2057720580
Touch.prototype.onPointerEnd = function (event) {
20578-
if (event.type === 'touch') {
20581+
if (event.type === 'touch' || event.type === "pointerup") {
2057920582
this._deregisterFinger(event, event.pointerId);
2058020583
}
2058120584
};
@@ -20611,7 +20614,10 @@ var Kiwi;
2061120614
if (Kiwi.DEVICE.pointerEnabled) {
2061220615
var pointerUp = 'pointerup', pointerDown = 'pointerdown', pointerEnter = 'pointerenter', pointerLeave = 'pointerleave', pointerCancel = 'pointercancel', pointerMove = 'pointermove';
2061320616
//Is it IE 10?
20614-
if ((window.navigator.msPointerEnabled)) {
20617+
if (window["PointerEvent"]) {
20618+
}
20619+
else if ((window["MSPointerEvent"])) {
20620+
// IE10 compatibility
2061520621
var pointerUp = 'MSPointerUp', pointerDown = 'MSPointerDown', pointerEnter = 'MSPointerEnter', pointerLeave = 'MSPointerLeave', pointerCancel = 'MSPointerCancel', pointerMove = 'MSPointerMove';
2061620622
}
2061720623
this._domElement.removeEventListener(pointerUp, this._onTouchStartBind, false);
@@ -34708,7 +34714,11 @@ var Kiwi;
3470834714
return GameManager;
3470934715
})();
3471034716
Kiwi.GameManager = GameManager;
34711-
Kiwi.Plugins = {};
34717+
var Plugins;
34718+
(function (Plugins) {
34719+
null;
34720+
})(Plugins = Kiwi.Plugins || (Kiwi.Plugins = {}));
34721+
;
3471234722
Kiwi.extend = function (d, b) {
3471334723
for (var p in b)
3471434724
if (b.hasOwnProperty(p))

‎build/kiwi.min.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Kiwi.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,7 @@ module Kiwi {
358358

359359
}
360360

361-
362-
export var Plugins = {};
361+
export module Plugins { null;};
363362

364363
export var extend:Function = function (d, b) {
365364
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -368,4 +367,4 @@ module Kiwi {
368367
d.prototype = new __();
369368
};
370369

371-
}
370+
}

‎templateGame/lib/kiwi.js‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20190,7 +20190,10 @@ var Kiwi;
2019020190
if (Kiwi.DEVICE.pointerEnabled) {
2019120191
var pointerUp = 'pointerup', pointerDown = 'pointerdown', pointerEnter = 'pointerenter', pointerLeave = 'pointerleave', pointerCancel = 'pointercancel', pointerMove = 'pointermove';
2019220192
//Is it IE 10?
20193-
if ((window.navigator.msPointerEnabled)) {
20193+
if (window["PointerEvent"]) {
20194+
}
20195+
else if ((window["MSPointerEvent"])) {
20196+
// IE10 compatibility
2019420197
var pointerUp = 'MSPointerUp', pointerDown = 'MSPointerDown', pointerEnter = 'MSPointerEnter', pointerLeave = 'MSPointerLeave', pointerCancel = 'MSPointerCancel', pointerMove = 'MSPointerMove';
2019520198
}
2019620199
this._onTouchStartBind = this.onPointerStart.bind(this);
@@ -20521,7 +20524,7 @@ var Kiwi;
2052120524
* @private
2052220525
*/
2052320526
Touch.prototype.onPointerStart = function (event) {
20524-
if (event.type === 'touch') {
20527+
if (event.type === 'touch' || event.type === "pointerdown") {
2052520528
this._registerFinger(event, event.pointerId);
2052620529
}
2052720530
};
@@ -20532,7 +20535,7 @@ var Kiwi;
2053220535
* @private
2053320536
*/
2053420537
Touch.prototype.onPointerCancel = function (event) {
20535-
if (event.type === 'touch') {
20538+
if (event.type === 'touch' || event.type === "pointercancel") {
2053620539
this._cancelFinger(event, event.pointerId);
2053720540
}
2053820541
};
@@ -20543,7 +20546,7 @@ var Kiwi;
2054320546
* @private
2054420547
*/
2054520548
Touch.prototype.onPointerEnter = function (event) {
20546-
if (event.type === 'touch') {
20549+
if (event.type === 'touch' || event.type === "pointerenter") {
2054720550
this._enterFinger(event, event.pointerId);
2054820551
}
2054920552
};
@@ -20554,7 +20557,7 @@ var Kiwi;
2055420557
* @private
2055520558
*/
2055620559
Touch.prototype.onPointerLeave = function (event) {
20557-
if (event.type === 'touch') {
20560+
if (event.type === 'touch' || event.type === "pointerleave") {
2055820561
this._leaveFinger(event, event.pointerId);
2055920562
}
2056020563
};
@@ -20564,7 +20567,7 @@ var Kiwi;
2056420567
* @param event {PointerEvent}
2056520568
*/
2056620569
Touch.prototype.onPointerMove = function (event) {
20567-
if (event.type === 'touch') {
20570+
if (event.type === 'touch' || event.type === "pointermove") {
2056820571
this._moveFinger(event, event.pointerId);
2056920572
}
2057020573
};
@@ -20575,7 +20578,7 @@ var Kiwi;
2057520578
* @private
2057620579
*/
2057720580
Touch.prototype.onPointerEnd = function (event) {
20578-
if (event.type === 'touch') {
20581+
if (event.type === 'touch' || event.type === "pointerup") {
2057920582
this._deregisterFinger(event, event.pointerId);
2058020583
}
2058120584
};
@@ -20611,7 +20614,10 @@ var Kiwi;
2061120614
if (Kiwi.DEVICE.pointerEnabled) {
2061220615
var pointerUp = 'pointerup', pointerDown = 'pointerdown', pointerEnter = 'pointerenter', pointerLeave = 'pointerleave', pointerCancel = 'pointercancel', pointerMove = 'pointermove';
2061320616
//Is it IE 10?
20614-
if ((window.navigator.msPointerEnabled)) {
20617+
if (window["PointerEvent"]) {
20618+
}
20619+
else if ((window["MSPointerEvent"])) {
20620+
// IE10 compatibility
2061520621
var pointerUp = 'MSPointerUp', pointerDown = 'MSPointerDown', pointerEnter = 'MSPointerEnter', pointerLeave = 'MSPointerLeave', pointerCancel = 'MSPointerCancel', pointerMove = 'MSPointerMove';
2061620622
}
2061720623
this._domElement.removeEventListener(pointerUp, this._onTouchStartBind, false);
@@ -34708,7 +34714,11 @@ var Kiwi;
3470834714
return GameManager;
3470934715
})();
3471034716
Kiwi.GameManager = GameManager;
34711-
Kiwi.Plugins = {};
34717+
var Plugins;
34718+
(function (Plugins) {
34719+
null;
34720+
})(Plugins = Kiwi.Plugins || (Kiwi.Plugins = {}));
34721+
;
3471234722
Kiwi.extend = function (d, b) {
3471334723
for (var p in b)
3471434724
if (b.hasOwnProperty(p))

0 commit comments

Comments
 (0)