Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Merge pull request #100 from Polymer/master
Browse files Browse the repository at this point in the history
8/15 master -> stable
  • Loading branch information
dfreedm committed Aug 15, 2013
2 parents e489891 + 9018371 commit 1fd0169
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions pointerevents.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
var src = script.attributes.src.value;
var basePath = src.slice(0, src.indexOf(thisFile));

if (!window.Loader) {
if (!window.PolymerLoader) {
var path = basePath + 'tools/loader/loader.js';
document.write('<script src="' + path + '"></script>');
}

document.write('<script>Loader.load("' + scopeName + '")</script>');
document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');

})();
4 changes: 2 additions & 2 deletions src/PointerEvent.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}

function PointerEvent(inType, inDict) {
var inDict = inDict || {};
inDict = inDict || {};
// According to the w3c spec,
// http://www.w3.org/TR/DOM-Level-3-Events/#events-MouseEvent-button
// MouseEvent.button == 0 can mean either no mouse button depressed, or the
Expand Down Expand Up @@ -103,7 +103,7 @@
if (!HAS_BUTTONS) {
// IE 10 has buttons on MouseEvent.prototype as a getter w/o any setting
// mechanism
Object.defineProperty(e, 'buttons', {get: function(){ return buttons }, enumerable: true});
Object.defineProperty(e, 'buttons', {get: function(){ return buttons; }, enumerable: true});
}

// Spec requires that pointers without pressure specified use 0.5 for down
Expand Down
4 changes: 2 additions & 2 deletions src/capture.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
if (!Element.prototype.setPointerCapture) {
Object.defineProperties(Element.prototype, {
'setPointerCapture': {
value: s,
value: s
},
'releasePointerCapture': {
value: r,
value: r
}
});
}
Expand Down
6 changes: 3 additions & 3 deletions src/dispatcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
// EVENTS
down: function(inEvent) {
this.fireEvent('pointerdown', inEvent)
this.fireEvent('pointerdown', inEvent);
},
move: function(inEvent) {
this.fireEvent('pointermove', inEvent);
Expand All @@ -74,15 +74,15 @@
},
enter: function(inEvent) {
inEvent.bubbles = false;
this.fireEvent('pointerenter', inEvent)
this.fireEvent('pointerenter', inEvent);
},
leave: function(inEvent) {
inEvent.bubbles = false;
this.fireEvent('pointerleave', inEvent);
},
over: function(inEvent) {
inEvent.bubbles = true;
this.fireEvent('pointerover', inEvent)
this.fireEvent('pointerover', inEvent);
},
out: function(inEvent) {
inEvent.bubbles = true;
Expand Down
2 changes: 1 addition & 1 deletion src/installer.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
} else if (m.type === 'attributes') {
this.elementChanged(m.target, m.oldValue);
}
},
}
};

if (!MO) {
Expand Down
4 changes: 2 additions & 2 deletions src/touch.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
EMITTER: 'none',
XSCROLLER: 'pan-x',
YSCROLLER: 'pan-y',
SCROLLER: /^(?:pan-x pan-y)|(?:pan-y pan-x)|auto$/,
SCROLLER: /^(?:pan-x pan-y)|(?:pan-y pan-x)|auto$/
},
touchActionToScrollType: function(touchAction) {
var t = touchAction;
Expand Down Expand Up @@ -305,7 +305,7 @@
var fn = (function(lts, lt){
var i = lts.indexOf(lt);
if (i > -1) {
lts.splice(i, 1)
lts.splice(i, 1);
}
}).bind(null, lts, lt);
setTimeout(fn, DEDUP_TIMEOUT);
Expand Down
2 changes: 1 addition & 1 deletion tools

0 comments on commit 1fd0169

Please sign in to comment.