Merge pull request #8 from Polymer/master

7/11 master -> stable
googlearchive · Jul 11, 2013 · 42f1a8a · 42f1a8a
2 parents d6147f1 + 39a1434
commit 42f1a8a
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 95 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,7 +1,7 @@
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-karma-0.9.1');
+  grunt.loadNpmTasks('grunt-karma');
 
   var os = require('os').type();
   var browsers = ['Chrome', 'Firefox'];
@@ -16,22 +16,11 @@ module.exports = function(grunt) {
     uglify: {
       pointergestures: {
         options: {
-          sourceMap: 'build/pointergestures.js.map',
-          sourceMappingURL: 'pointergestures.js.map',
-          sourceMapRoot: '..'
+          banner: grunt.file.read('LICENSE'),
+          sourceMap: 'pointergestures.js.map',
         },
-        dest: 'build/pointergestures.js',
-        src: [
-          'src/PointerGestureEvent.js',
-          'src/initialize.js',
-          'src/sidetable.js',
-          'src/pointermap.js',
-          'src/dispatcher.js',
-          'src/hold.js',
-          'src/track.js',
-          'src/flick.js',
-          'src/tap.js'
-        ]
+        dest: 'pointergestures.min.js',
+        src: grunt.file.readJSON('build.json')
       }
     },
     karma: {

diff --git a/build.json b/build.json
@@ -0,0 +1,11 @@
+[
+  "src/PointerGestureEvent.js",
+  "src/initialize.js",
+  "src/sidetable.js",
+  "src/pointermap.js",
+  "src/dispatcher.js",
+  "src/hold.js",
+  "src/track.js",
+  "src/flick.js",
+  "src/tap.js"
+]
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,96 +1,99 @@
-// Karma configuration
-// Generated on Fri May 31 2013 11:01:14 GMT-0700 (PDT)
+module.exports = function(karma) {
+  karma.configure({
+    // base path, that will be used to resolve files and exclude
+    basePath: '../',
 
 
-// base path, that will be used to resolve files and exclude
-basePath = '';
+    // frameworks to use
+    frameworks: ['mocha'],
 
 
-// frameworks to use
-frameworks = ['mocha'];
+    // list of files / patterns to load in the browser
+    files: [
+      'PointerGestures/node_modules/chai/chai.js',
+      'PointerGestures/node_modules/chai-spies/chai-spies.js',
+      'PointerEvents/src/boot.js',
+      'PointerEvents/src/PointerEvent.js',
+      'PointerEvents/src/pointermap.js',
+      'PointerEvents/src/sidetable.js',
+      'PointerEvents/src/dispatcher.js',
+      'PointerEvents/src/installer.js',
+      'PointerEvents/src/mouse.js',
+      'PointerEvents/src/touch.js',
+      'PointerEvents/src/ms.js',
+      'PointerEvents/src/platform-events.js',
+      'PointerEvents/src/capture.js',
+      'PointerGestures/src/PointerGestureEvent.js',
+      'PointerGestures/src/initialize.js',
+      'PointerGestures/src/sidetable.js',
+      'PointerGestures/src/pointermap.js',
+      'PointerGestures/src/dispatcher.js',
+      'PointerGestures/src/hold.js',
+      'PointerGestures/src/track.js',
+      'PointerGestures/src/flick.js',
+      'PointerGestures/src/tap.js',
+      'PointerGestures/tests/setup.js',
+      'PointerGestures/tests/!(setup).js'
+    ],
 
 
-// list of files / patterns to load in the browser
-files = [
-  'node_modules/chai/chai.js',
-  'node_modules/chai-spies/chai-spies.js',
-  '../PointerEvents/src/boot.js',
-  '../PointerEvents/src/PointerEvent.js',
-  '../PointerEvents/src/pointermap.js',
-  '../PointerEvents/src/sidetable.js',
-  '../PointerEvents/src/dispatcher.js',
-  '../PointerEvents/src/installer.js',
-  '../PointerEvents/src/platform-events.js',
-  '../PointerEvents/src/capture.js',
-  'src/PointerGestureEvent.js',
-  'src/initialize.js',
-  'src/sidetable.js',
-  'src/pointermap.js',
-  'src/dispatcher.js',
-  'src/hold.js',
-  'src/track.js',
-  'src/flick.js',
-  'src/tap.js',
-  'tests/setup.js',
-  'tests/!(setup).js'
-];
+    // list of files to exclude
+    exclude: [],
 
 
-// list of files to exclude
-exclude = [];
+    // test results reporter to use
+    // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
+    reporters: ['progress'],
 
 
-// test results reporter to use
-// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
-reporters = ['progress'];
+    // web server port
+    port: 9876,
 
 
-// web server port
-port = 9876;
+    // cli runner port
+    runnerPort: 9100,
 
 
-// cli runner port
-runnerPort = 9100;
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
 
 
-// enable / disable colors in the output (reporters and logs)
-colors = true;
+    // level of logging
+    // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+    logLevel: karma.LOG_INFO,
 
 
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-logLevel = LOG_INFO;
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
 
 
-// enable / disable watching file and executing tests whenever any file changes
-autoWatch = false;
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera
+    // - Safari (only Mac)
+    // - PhantomJS
+    // - IE (only Windows)
+    browsers: ['Chrome'],
 
 
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-browsers = ['Chrome'];
+    // If browser does not capture in given timeout [ms], kill it
+    captureTimeout: 60000,
 
 
-// If browser does not capture in given timeout [ms], kill it
-captureTimeout = 60000;
+    // Continuous Integration mode
+    // if true, it capture browsers, run tests and exit
+    singleRun: true,
 
 
-// Continuous Integration mode
-// if true, it capture browsers, run tests and exit
-singleRun = true;
-
-
-// plugins to load
-plugins = [
-  'karma-mocha',
-  'karma-chrome-launcher',
-  'karma-firefox-launcher',
-  'karma-script-launcher',
-  'karma-crbot-reporter'
-];
+    // plugins to load
+    plugins: [
+      'karma-mocha',
+      'karma-chrome-launcher',
+      'karma-firefox-launcher',
+      'karma-script-launcher',
+      'karma-crbot-reporter'
+    ]
+  });
+};
diff --git a/package.json b/package.json
@@ -8,14 +8,14 @@
     "mocha": "*",
     "chai": "*",
     "chai-spies": "*",
-    "grunt": "*",
-    "grunt-contrib-clean": "*",
-    "grunt-contrib-uglify": "*",
-    "grunt-contrib-yuidoc": "*",
+    "grunt": "~0.4.1",
+    "grunt-contrib-clean": "~0.4.0",
+    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-contrib-yuidoc": "~0.4.0",
     "karma-mocha": "*",
     "karma-script-launcher": "*",
     "karma-crbot-reporter": "*",
-    "grunt-karma-0.9.1": "*"
+    "grunt-karma": "~0.5.0"
   },
   "scripts": {
     "test": "grunt test"

diff --git a/samples/track/index.html b/samples/track/index.html
@@ -12,28 +12,24 @@
     .container {
       display: -webkit-box;
       display: -webkit-flex;
-      display: -moz-box;
       display: -ms-flexbox;
       display: flex;
     }
     .container > * {
       -webkit-box-flex: 1;
       -webkit-flex: 1 auto;
-      -moz-box-flex: 1;
       -ms-flex: 1 auto;
       flex: 1 auto;
     }
     .row {
       -webkit-box-orient: horizontal;
       -webkit-flex-direction: row;
-      -moz-box-orient: horizontal;
       -ms-flex-direction: row;
       flex-direction: row;
     }
     .column {
       -webkit-box-orient: vertical;
       -webkit-flex-direction: column;
-      -moz-box-orient: vertical;
       -ms-flex-direction: column;
       flex-direction: column;
     }