Merge pull request #100 from Polymer/master

8/15 master -> stable

pointerevents.js

@@ -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>');
 
 })();

src/PointerEvent.js

@@ -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
@@ -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

src/capture.js

@@ -35,10 +35,10 @@
   if (!Element.prototype.setPointerCapture) {
     Object.defineProperties(Element.prototype, {
       'setPointerCapture': {
-        value: s,
+        value: s
       },
       'releasePointerCapture': {
-        value: r,
+        value: r
       }
     });
   }

src/dispatcher.js

@@ -64,7 +64,7 @@
     },
     // EVENTS
     down: function(inEvent) {
-      this.fireEvent('pointerdown', inEvent)
+      this.fireEvent('pointerdown', inEvent);
     },
     move: function(inEvent) {
       this.fireEvent('pointermove', inEvent);
@@ -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;

src/installer.js

@@ -104,7 +104,7 @@
       } else if (m.type === 'attributes') {
         this.elementChanged(m.target, m.oldValue);
       }
-    },
+    }
   };
 
   if (!MO) {

src/touch.js

@@ -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;
@@ -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);