7/11 master -> stable

.gitignore

@@ -1,5 +1,7 @@
-/platform/min/*.js
 node_modules
 docs
 local.json
 /test.bat
+polymer.min*
+polymer.sandbox*
+polymer.native*

CONTRIBUTING.md

@@ -24,13 +24,15 @@ Here's an easy guide that should get you up and running:
 1. Fork the project on github and pull down your copy.
    > replace the {{ username }} with your username and {{ repository }} with the repository name
 
-        git clone git@github.com:{{ username }}/{{ repository }}.git --recursive
+        git clone git@github.com:{{ username }}/{{ repository }}.git -b master --recursive
 
     Note the `--recursive`. This is necessary for submodules to initialize properly. If you don't do a recursive clone, you'll have to init them manually:
 
         git submodule init
         git submodule update
 
+    Adding `-b master` is a shorthand to checkout the `master` branch. If you include it, skip step 2.
+
 2. Development happens on the `master` branch. Get yourself on it!
 
         git checkout master

conf/karma.conf.js

@@ -1,91 +1,108 @@
-// Sample Karma configuration file, that contain pretty much all the available options
-// It's used for running client tests on Travis (http://travis-ci.org/#!/karma-runner/karma)
-// Most of the options can be overriden by cli arguments (see karma --help)
-//
-// For all available config options and default values, see:
-// https://github.com/karma-runner/karma/blob/stable/lib/config.js#L54
-
-
-// base path, that will be used to resolve files and exclude
-basePath = '../../';
-
-// list of files / patterns to load in the browser
-files = [
-  'polymer/tools/test/mocha-htmltest.js',
-  'polymer/conf/mocha.conf.js',
-  'polymer/node_modules/chai/chai.js',
-  'polymer/polymer.js',
-  'polymer/test/js/*.js',
-  {pattern: 'platform/*.js', included: false},
-  {pattern: 'polymer/tools/**/*.js', included: false},
-  {pattern: 'polymer/src/*.js', included: false},
-  {pattern: 'polymer/test/**/*.html', included: false},
-  {pattern: 'polymer/test/**/*.css', included: false},
-  {pattern: 'polymer/test/**/*.js', included: false}
-];
-
-// list of files to exclude
-exclude = [];
-
-frameworks = ['mocha'];
-
-// use dots reporter, as travis terminal does not support escaping sequences
-// possible values: 'dots', 'progress', 'junit', 'teamcity'
-// CLI --reporters progress
-reporters = ['progress'];
-
-// web server port
-// CLI --port 9876
-port = 9876;
-
-// cli runner port
-// CLI --runner-port 9100
-runnerPort = 9100;
-
-// enable / disable colors in the output (reporters and logs)
-// CLI --colors --no-colors
-colors = true;
-
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-// CLI --log-level debug
-logLevel = LOG_INFO;
-
-// enable / disable watching file and executing tests whenever any file changes
-// CLI --auto-watch --no-auto-watch
-autoWatch = true;
-
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-// CLI --browsers Chrome,Firefox,Safari
-browsers = ['ChromeCanary'];
-
-// If browser does not capture in given timeout [ms], kill it
-// CLI --capture-timeout 5000
-captureTimeout = 50000;
-
-// Auto run tests on start (when browsers are captured) and exit
-// CLI --single-run --no-single-run
-singleRun = true;
-
-// report which specs are slower than 500ms
-// CLI --report-slower-than 500
-reportSlowerThan = 500;
-
-// compile coffee scripts
-preprocessors = {
+module.exports = function(karma) {
+  karma.configure({
+    // base path, that will be used to resolve files and exclude
+    basePath: '../../',
+
+    // list of files / patterns to load in the browser
+    files: [
+      'polymer/tools/test/mocha-htmltest.js',
+      'polymer/conf/mocha.conf.js',
+      'polymer/node_modules/chai/chai.js',
+      'polymer/polymer.js',
+      'polymer/test/js/*.js',
+      {pattern: 'platform/*.js', included: false},
+      {pattern: 'platform/tools/**/*.js', included: false},
+      {pattern: 'platform/platform.*', included: false},
+      {pattern: 'platform/test/**/*.html', included: false},
+      {pattern: 'platform/test/**/*.js', included: false},
+      {pattern: 'platform/src/*.js', included: false},
+      {pattern: 'CustomElements/custom-elements.js', included: false},
+      {pattern: 'CustomElements/MutationObservers/*.js', included: false},
+      {pattern: 'CustomElements/src/*.js', included: false},
+      {pattern: 'HTMLImports/html-imports.js', included: false},
+      {pattern: 'HTMLImports/src/*', included: false},
+      {pattern: 'mdv/mdv.js', included: false},
+      {pattern: 'mdv/src/*', included: false},
+      {pattern: 'mdv/third_party/**/*.js', included: false},
+      {pattern: 'mdv/util/*.js', included: false},
+      {pattern: 'mdv/tests/*.js', included: false},
+      {pattern: 'ShadowDOM/shadowdom.js', included: false},
+      {pattern: 'ShadowDOM/src/**/*.js', included: false},
+      {pattern: 'PointerEvents/pointerevents.js', included: false},
+      {pattern: 'PointerEvents/src/*.js', included: false},
+      {pattern: 'PointerGestures/pointergestures.js', included: false},
+      {pattern: 'PointerGestures/src/*.js', included: false},
+      {pattern: 'polymer/tools/**/*.js', included: false},
+      {pattern: 'polymer/src/**/*.js', included: false},
+      {pattern: 'polymer/test/**/*.html', included: false},
+      {pattern: 'polymer/test/**/*.css', included: false},
+      {pattern: 'polymer/test/**/*.js', included: false}
+    ],
+
+    // list of files to exclude
+    exclude: [],
+
+    frameworks: ['mocha'],
+
+    // use dots reporter, as travis terminal does not support escaping sequences
+    // possible values: 'dots', 'progress', 'junit', 'teamcity'
+    // CLI --reporters progress
+    reporters: ['progress'],
+
+    // web server port
+    // CLI --port 9876
+    port: 9876,
+
+    // cli runner port
+    // CLI --runner-port 9100
+    runnerPort: 9100,
+
+    // enable / disable colors in the output (reporters and logs)
+    // CLI --colors --no-colors
+    colors: true,
+
+    // level of logging
+    // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+    // CLI --log-level debug
+    logLevel: karma.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    // CLI --auto-watch --no-auto-watch
+    autoWatch: true,
+
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera
+    // - Safari (only Mac)
+    // - PhantomJS
+    // - IE (only Windows)
+    // CLI --browsers Chrome,Firefox,Safari
+    browsers: ['ChromeCanary'],
+
+    // If browser does not capture in given timeout [ms], kill it
+    // CLI --capture-timeout 5000
+    captureTimeout: 50000,
+
+    // Auto run tests on start (when browsers are captured) and exit
+    // CLI --single-run --no-single-run
+    singleRun: true,
+
+    // report which specs are slower than 500ms
+    // CLI --report-slower-than 500
+    reportSlowerThan: 500,
+
+    // compile coffee scripts
+    preprocessors: {
+    },
+
+    plugins: [
+      'karma-mocha',
+      'karma-chrome-launcher',
+      'karma-firefox-launcher',
+      'karma-script-launcher',
+      'karma-crbot-reporter'
+    ]
+  });
 };
-
-plugins = [
-  'karma-mocha',
-  'karma-chrome-launcher',
-  'karma-firefox-launcher',
-  'karma-script-launcher',
-  'karma-crbot-reporter'
-]

gruntfile.js

@@ -17,24 +17,31 @@ module.exports = function(grunt) {
   ];
 
   Polymer = [
-    'src/build.js',
-    'src/lang.js',
-    'src/oop.js',
-    'src/register.js',
-    'src/base.js',
-    'src/trackObservers.js',
-    'src/bindProperties.js',
-    'src/bindMDV.js',
-    'src/attrs.js',
-    'src/marshal.js',
-    'src/events.js',
-    'src/observeProperties.js',
-    'src/styling.js',
-    'src/shimStyling.js',
-    'src/path.js',
-    'src/job.js',
-    'src/boot.js'
-  ];
+    "polymer.js",
+    "boot.js",
+    "shimStyling.js",
+    "lib/lang.js",
+    "lib/dom.js",
+    "lib/deserialize.js",
+    "lib/job.js",
+    "lib/super.js",
+    "api.js",
+    "instance/utils.js",
+    "instance/events.js",
+    "instance/properties.js",
+    "instance/attributes.js",
+    "instance/mdv.js",
+    "instance/base.js",
+    "instance/styles.js",
+    "declaration/path.js",
+    "declaration/styles.js",
+    "declaration/events.js",
+    "declaration/properties.js",
+    "declaration/attributes.js",
+    "declaration/polymer-element.js"
+  ].map(function(n) {
+    return "src/" + n;
+  });
 
   // karma setup
   var browsers;
@@ -63,9 +70,6 @@ module.exports = function(grunt) {
         configFile: 'conf/karma.conf.js',
         keepalive: true
       },
-      browserstack: {
-        browsers: ["BrowserStack:IE:Win"]
-      },
       buildbot: {
         browsers: browsers,
         reporters: ['crbot'],
@@ -82,7 +86,8 @@ module.exports = function(grunt) {
       },
       Polymer: {
         options: {
-          sourceMap: 'polymer.min.js.map'
+          sourceMap: 'polymer.min.js.map',
+          //mangle: false, beautify: true, compress: false
         },
         files: {
           'polymer.min.js': [].concat(Platform, Polymer)
@@ -99,9 +104,7 @@ module.exports = function(grunt) {
       PolymerSandbox: {
         options: {
           sourceMap: 'polymer.sandbox.min.js.map',
-          mangle: false,
-          beautify: true,
-          compress: false
+          //mangle: false, beautify: true, compress: false
         },
         files: {
           'polymer.sandbox.min.js': [].concat(PlatformSandbox, Polymer)
@@ -153,7 +156,7 @@ module.exports = function(grunt) {
   // plugins
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-yuidoc');
-  grunt.loadNpmTasks('grunt-karma-0.9.1');
+  grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-audit');
 
   // tasks

package.json

@@ -7,7 +7,7 @@
     "grunt": "*",
     "grunt-contrib-uglify": "*",
     "grunt-contrib-yuidoc": "*",
-    "grunt-karma-0.9.1": "~0.4.3",
+    "grunt-karma": "~0.5.0",
     "karma-mocha": "*",
     "karma-script-launcher": "*",
     "karma-crbot-reporter": "*",

polymer.js

@@ -8,25 +8,33 @@
 
 var thisFile = 'polymer.js';
 var scopeName = 'Polymer';
+
 var modules = [
-  '../platform/platform.js',
-  'src/lang.js',
-  'src/oop.js',
-  'src/register.js',
-  'src/base.js',
-  'src/trackObservers.js',
-  'src/bindProperties.js',
-  'src/bindMDV.js',
-  'src/attrs.js',
-  'src/marshal.js',
-  'src/events.js',
-  'src/observeProperties.js',
-  'src/styling.js',
-  'src/shimStyling.js',
-  'src/path.js',
-  'src/job.js',
-  'src/boot.js'
-];
+  "../platform/platform.js"
+].concat([
+  "boot.js",
+  "lib/lang.js",
+  "lib/job.js",
+  "lib/dom.js",
+  "lib/super.js",
+  "lib/deserialize.js",
+  "api.js",
+  "instance/utils.js",
+  "instance/events.js",
+  "instance/properties.js",
+  "instance/attributes.js",
+  "instance/mdv.js",
+  "instance/base.js",
+  "instance/styles.js",
+  "declaration/path.js",
+  "declaration/styles.js",
+  "declaration/events.js",
+  "declaration/properties.js",
+  "declaration/attributes.js",
+  "declaration/polymer-element.js"
+].map(function(n) {
+  return "src/" + n;
+}));
 
 // export