Merge pull request Addepar#126 from LetsMakeDataEasy/merge-from-upstream

More commits from upstream

.editorconfig

@@ -4,6 +4,7 @@
 
 root = true
 
+
 [*]
 end_of_line = lf
 charset = utf-8
@@ -12,5 +13,22 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
 [*.{diff,md}]
 trim_trailing_whitespace = false

.npmignore

@@ -2,6 +2,7 @@ bower_components/
 ember-dist/
 tests/
 tmp/
+dist/
 
 .bowerrc
 .editorconfig

.travis.yml

@@ -1,13 +1,27 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
 cache:
   directories:
     - node_modules
 
+env:
+  - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
@@ -17,7 +31,7 @@ install:
   - bower install
 
 script:
-  - npm test
+  - ember try $EMBER_TRY_SCENARIO test
 
 notifications:
   slack: hedgeserv:QQblFhv13dIPhqwoXI6qTDzA

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}

CHANGELOG.md

@@ -1,7 +1,50 @@
 # Ember Table Changelog
 
+### Ember Table 0.9.0 _(July 15, 2015)_
+
+_Compatible with Ember 1.12.1_
+
+* Upgrade to Ember-CLI 0.2.7
+* Support for Ember 1.12.1
+    * Unfortunately, the template compiler checks against the version number of
+      precompiled templates - including the patch version (1.12.1). If you are
+      using the globals build (dist/ folder) and a different version of ember,
+      you will need to fork ember-table and recompile with `grunt dist`.
+    * Ember-CLI usage is unchanged.
+
+### Ember Table 0.8.0 _(July 13, 2015)_
+
+_Compatible with Ember 1.11.3_
+
+* Support for Ember 1.11.3
+    * Unfortunately, the template compiler checks against the version number of
+      precompiled templates - including the patch version (1.11.3). If you are
+      using the globals build (dist/ folder) and a different version of ember,
+      you will need to fork ember-table and recompile with `grunt dist`.
+    * Ember-CLI usage is unchanged.
+
+### Ember Table 0.7.0 _(July 13, 2015)_
+
+_Compatible with Ember 1.10_
+
+* Support for Ember 1.10
+    * Precompiled templates (for use outside of ember-cli) are
+      compiled with Htmlbars, so they will work with
+      Ember 1.10 apps.
+
+### Ember Table 0.6.0 _(July 10, 2015)_
+
+_Compatible with Ember 1.9_
+
+* Support for Ember 1.9
+    * Precompiled templates (for use outside of ember-cli) are
+      compiled with Handlebars 2.0, so they will work with
+      Ember 1.9 apps.
+
 ### Ember Table 0.5.1 _(July 7, 2015)_
 
+_Compatible with Ember 1.4 through 1.8_
+
 * Fix antiscroll cleanup
 * Fix lazy container `childView` bug
 * Fix issue #165, isLastRow property problem.

README.md

@@ -18,7 +18,7 @@ http://addepar.github.com/ember-table/
 
 #### JS Bin Starter Kit
 
-http://emberjs.jsbin.com/lihigu/edit
+http://emberjs.jsbin.com/cijisu/edit
 
 #### Installation with Ember CLI (Recommended)
 

VERSION

@@ -1 +1 @@
-0.5.1
+0.9.0

bower.json

@@ -2,25 +2,23 @@
   "name": "ember-table",
   "dependencies": {
     "antiscroll": "Addepar/antiscroll#e0d1538cf4f3fd61c5bedd6168df86d651f125da",
-    "handlebars": "~1.3.0",
-    "ember": ">=1.4 <1.9",
+    "ember": ">=1.12 <1.13",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
+    "ember-data": "1.0.0-beta.18",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.3",
+    "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.15",
     "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0",
+    "qunit": "~1.17.1",
     "jquery-mousewheel": "~3.1.4",
     "jquery-ui": "~1.11.4",
     "jquery-simulate": "~1.0.1",
-    "blanket": "~1.1.5"
-  },
-  "devDependencies": {
-    "bootstrap": "3.0.0",
+    "blanket": "~1.1.5",
     "d3": "~3.5.3",
-    "ember-resolver": "~0.1.15",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
-    "ember-qunit-notifications": "0.0.7",
-    "lodash": "^2.4.0",
-    "qunit": "~1.17.1"
+    "bootstrap": "3.0.0",
+    "lodash": "^2.4.0"
   }
 }

config/ember-try.js

@@ -0,0 +1,35 @@
+module.exports = {
+  scenarios: [
+    {
+      name: 'default',
+      dependencies: { }
+    },
+    {
+      name: 'ember-release',
+      dependencies: {
+        'ember': 'components/ember#release'
+      },
+      resolutions: {
+        'ember': 'release'
+      }
+    },
+    {
+      name: 'ember-beta',
+      dependencies: {
+        'ember': 'components/ember#beta'
+      },
+      resolutions: {
+        'ember': 'beta'
+      }
+    },
+    {
+      name: 'ember-canary',
+      dependencies: {
+        'ember': 'components/ember#canary'
+      },
+      resolutions: {
+        'ember': 'canary'
+      }
+    }
+  ]
+};

ember-cli-build.js

@@ -57,6 +57,7 @@ module.exports = function(defaults) {
    */
   if(app.env === 'test') {
     app.import(app.bowerDirectory + '/jquery-simulate/jquery.simulate.js');
+    app.import(app.bowerDirectory + '/ember/ember-template-compiler.js');
   }
 
   return app.toTree();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-table",
-  "version": "0.5.1",
+  "version": "0.9.0",
   "description": "Table built using Ember.js that lazily renders rows.",
   "directories": {
     "doc": "doc",
@@ -9,23 +9,17 @@
   "scripts": {
     "start": "ember server",
     "build": "ember build",
-    "test": "ember test"
+    "test": "ember try:testall"
   },
   "repository": "https://github.com/Addepar/ember-table",
   "engines": {
     "node": ">= 0.10.0"
   },
   "author": "",
   "license": "BSD",
-  "dependencies": {
-    "ember-cli-less": "~1.3.1"
-  },
   "devDependencies": {
-    "body-parser": "^1.2.0",
-    "broccoli": "^0.13.0",
     "broccoli-asset-rev": "^2.0.2",
     "broccoli-cli": "~1.0.0",
-    "broccoli-ember-hbs-template-compiler": "^1.6.1",
     "broccoli-es3-safe-recast": "^2.0.0",
     "broccoli-es6-concatenator": "^0.1.11",
     "broccoli-es6modules": "~0.5.1",
@@ -42,22 +36,20 @@
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.1.0",
     "ember-cli-font-awesome": "0.0.7",
+    "ember-cli-htmlbars": "0.7.9",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-lodash": "1.0.1",
     "ember-cli-qunit": "0.3.13",
     "ember-cli-replace": "~0.1.0",
-    "ember-cli-uglify": "1.0.1",
-    "ember-export-application-global": "^1.0.2",
-    "express": "^4.8.5",
     "glob": "^4.0.5",
     "grunt": "~0.4.1",
     "grunt-banner": "~0.2.2",
     "grunt-broccoli": "~0.4.0",
     "grunt-broccoli-build": "~0.6.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-uglify": "0.8.0",
-    "grunt-release-it": "~0.2.1",
+    "grunt-release-it": "0.2.1",
     "grunt-text-replace": "~0.3.11",
     "rimraf": "2.3.1",
     "rsvp": "^3.0.13",
@@ -66,6 +58,10 @@
   "keywords": [
     "ember-addon"
   ],
+  "dependencies": {
+    "ember-cli-babel": "^5.0.0",
+    "ember-cli-less": "~1.3.1"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "demoURL": "https://addepar.github.io/ember-table/#/overview"

packaging/Brocfile.js

@@ -8,7 +8,7 @@ var pickFiles = require('broccoli-static-compiler');
 var compileES6 = require('broccoli-es6-concatenator');
 var ES6Modules = require('broccoli-es6modules');
 var es3Safe = require('broccoli-es3-safe-recast');
-var templateCompiler = require('broccoli-ember-hbs-template-compiler');
+var HtmlbarsCompiler = require('ember-cli-htmlbars');
 var less = require('broccoli-less-single');
 var wrap = require('./wrap');
 var globals = require('./globals');
@@ -19,7 +19,13 @@ var addonTree = pickFiles('addon', {
 });
 
 // Compile templates
-var templateTree = templateCompiler('app/templates', { module: true });
+var templateTree = new HtmlbarsCompiler('app/templates', {
+  isHtmlBars: true,
+
+  // provide the templateCompiler that is paired with your Ember version
+  templateCompiler: require('../bower_components/ember/ember-template-compiler')
+});
+
 templateTree = pickFiles(templateTree, {srcDir: '/', destDir: 'ember-table/templates'});
 
 var sourceTree = mergeTrees([templateTree, addonTree], {overwrite: true});

testem.json

@@ -1,6 +1,7 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed&coverage",
+  "disable_watching": true,
   "launch_in_ci": [
     "PhantomJS"
   ],

tests/dummy/app/templates/configurable-columns.hbs

@@ -96,7 +96,7 @@ export default Ember.Controller.extend({
   tableContent: Ember.computed(function() {
     var content = [];
     var date;
-    for (var i = 0; i < 100; i++) {
+    for (var i = 0; i &lt; 100; i++) {
       date = new Date();
       date.setDate(date.getDate() + i);
       content.pushObject({

tests/dummy/app/templates/overview.hbs

@@ -137,7 +137,7 @@ $ ember serve</code></pre>
     <div class="col-md-6">
       <hr>
       <h1>Changelog</h1>
-      <p>The current version is 0.5.1.</p>
+      <p>The current version is 0.9.0.</p>
       <p>For the full list of changes, please see <a target="_BLANK" href="https://github.com/Addepar/ember-table/blob/master/CHANGELOG.md">CHANGELOG.md</a>.</p>
     </div>
     <div class="col-md-6">

tests/dummy/public/crossdomain.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
 
-    <!-- Most restrictive policy: -->
-    <site-control permitted-cross-domain-policies="none"/>
+  <!-- Most restrictive policy: -->
+  <site-control permitted-cross-domain-policies="none"/>
 
-    <!-- Least restrictive policy: -->
-    <!--
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="*" to-ports="*" secure="false"/>
-    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-    -->
+  <!-- Least restrictive policy: -->
+  <!--
+  <site-control permitted-cross-domain-policies="all"/>
+  <allow-access-from domain="*" to-ports="*" secure="false"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+  -->
 </cross-domain-policy>

tests/dummy/public/robots.txt

@@ -1,2 +1,3 @@
 # http://www.robotstxt.org
 User-agent: *
+Disallow:

tests/unit/components/chunked-grouping-row-test.js

@@ -67,10 +67,12 @@ test('collapse chunked top level rows', function (assert) {
 
   defers.ready(function () {
     helper.rowGroupingIndicator(0).click();
-    helper.rowGroupingIndicator(0).click();
   }, [0, 1]);
 
   return defers.ready(function () {
+    Ember.run(function() {
+      helper.rowGroupingIndicator(0).click();
+    });
     assert.equal(helper.rowGroupingIndicator(0).hasClass("unfold"), false, 'grouping row is collapsed');
     assert.equal(helper.fixedBodyRows().length, 12, 'children rows are collapsed');
   });