WIP: emberjs/ember.js#10256

alexandre-melard · Jun 5, 2015 · 32eb163 · 32eb163
1 parent 247be6e
commit 32eb163
Show file tree

Hide file tree

Showing 43 changed files with 131 additions and 134 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,10 +15,3 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
-.idea
-.bowerrc
-.editorconfig
-.ember-cli
-.jshintrc
-.travis.yml
-
diff --git a/.jshintrc b/.jshintrc
@@ -1,13 +1,11 @@
 {
   "predef": [
-    "document",
-    "window",
-    "-Promise",
-    "Promise",
-    "ol",
-    "$",
-    "google"
-  ],
+  "document",
+  "window",
+  "-Promise",
+  "ol",
+  "$",
+  "google"],
   "browser": true,
   "boss": true,
   "curly": true,

diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ cache:
     - node_modules
 
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 

diff --git a/Brocfile.js b/Brocfile.js
@@ -30,21 +30,21 @@ app.import('bower_components/x-editable/dist/bootstrap3-editable/js/bootstrap-ed
 
 app.import('bower_components/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css');
 app.import('bower_components/x-editable/dist/bootstrap3-editable/img/loading.gif', {
-  destDir: 'assets/images'
+    destDir: 'assets/images'
 });
 app.import('bower_components/x-editable/dist/bootstrap3-editable/img/clear.png', {
-  destDir: 'assets/images'
+    destDir: 'assets/images'
 });
 
 app.import('bower_components/bootstrap/dist/css/bootstrap.css');
 app.import('bower_components/bootstrap/dist/css/bootstrap.css.map', {
-  destDir: 'assets'
+    destDir: 'assets'
 });
 
 var bootstrapFonts = pickFiles('bower_components/bootstrap/dist/', {
-  srcDir: '/fonts',
-  files: ['*'],
-  destDir: '/fonts'
+    srcDir: '/fonts',
+    files: ['*'],
+    destDir: '/fonts'
 });
 
 

diff --git a/app/app.js b/app/app.js
@@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
+var App;
+
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
@@ -24,8 +26,8 @@ Ember.Route.reopen({
       'mtgItem',
       'mtgLevel',
       'mtgTrail'].forEach(function(model) {
-      me.store.find(model);
-    });
+        me.store.find(model);
+      });
   }
 });
 

diff --git a/app/controllers/map-draw.js b/app/controllers/map-draw.js
@@ -2,14 +2,14 @@
  * Created by alex on 04/04/2015.
  */
 import Ember from 'ember';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 import tooltip from '../utils/ol-tooltip';
-import getRGB from "../utils/color-get-rgb.js";
-import calcBrightness from "../utils/color-get-brightness.js";
-import colorLuminance from "../utils/color-get-luminance.js";
-import getRoute from "../utils/google-route-between-a-and-b.js";
-import formatLength from "../utils/map-format-length.js";
-import formatArea from "../utils/map-format-area.js";
+import getRGB from "../utils/color-get-rgb";
+import calcBrightness from "../utils/color-get-brightness";
+import colorLuminance from "../utils/color-get-luminance";
+import getRoute from "../utils/google-route-between-a-and-b";
+import formatLength from "../utils/map-format-length";
+import formatArea from "../utils/map-format-area";
 
 export default Ember.Controller.extend({
 

diff --git a/app/controllers/map-location.js b/app/controllers/map-location.js
@@ -2,9 +2,9 @@
  * Created by alex on 06/04/2015.
  */
 import Ember from 'ember';
-import getLatLng from '../utils/google-geocoder-latlng.js';
-import geoLoc from '../utils/geocoding-watch-position.js';
-import consts from '../utils/map-constants.js';
+import getLatLng from '../utils/google-geocoder-latlng';
+import geoLoc from '../utils/geocoding-watch-position';
+import consts from '../utils/map-constants';
 
 export default Ember.Controller.extend({
   needs: ['map'],

diff --git a/app/controllers/map-settings.js b/app/controllers/map-settings.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import getStyleFunction from "../utils/map-style.js";
-import consts from "../utils/map-constants.js";
+import getStyleFunction from "../utils/map-style";
+import consts from "../utils/map-constants";
 
 /**
  * Created by alex on 29/03/2015.

diff --git a/app/controllers/map.js b/app/controllers/map.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import getStyleFunction from "../utils/map-style.js";
-import conf from "../config/environment.js";
+import getStyleFunction from "../utils/map-style";
+import conf from "../config/environment";
 
 /**
  * Created by alex on 29/03/2015.

diff --git a/app/controllers/mtg-item.js b/app/controllers/mtg-item.js
@@ -2,7 +2,7 @@
  * Created by alex on 22/04/2015.
  */
 import Ember from 'ember';
-import consts from '../utils/map-constants.js';
+import consts from '../utils/map-constants';
 
 export default Ember.Controller.extend({
   needs: ["mtgTrail"],

diff --git a/app/controllers/mtg-level.js b/app/controllers/mtg-level.js
@@ -2,7 +2,7 @@
  * Created by alex on 04/04/2015.
  */
 import Ember from 'ember';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 export default Ember.Controller.extend({
   needs: ["mtgTrail"],

diff --git a/app/controllers/mtg-trace.js b/app/controllers/mtg-trace.js
@@ -2,9 +2,9 @@
  * Created by alex on 04/04/2015.
  */
 import Ember from 'ember';
-import * as consts from '../utils/map-constants.js';
-import formatLength from "../utils/map-format-length.js";
-import file from "../utils/file-io.js";
+import * as consts from '../utils/map-constants';
+import formatLength from "../utils/map-format-length";
+import file from "../utils/file-io";
 
 export default Ember.Controller.extend({
   needs: ["mtgTrail"],

diff --git a/app/controllers/mtg-trail.js b/app/controllers/mtg-trail.js
@@ -2,10 +2,10 @@
  * Created by alex on 04/04/2015.
  */
 import Ember from 'ember';
-import * as consts from '../utils/map-constants.js';
-import getStyleFunction from "../utils/map-style.js";
-import formatLength from "../utils/map-format-length.js";
-import file from "../utils/file-io.js";
+import * as consts from '../utils/map-constants';
+import getStyleFunction from "../utils/map-style";
+import formatLength from "../utils/map-format-length";
+import file from "../utils/file-io";
 
 export default Ember.Controller.extend({
 

diff --git a/app/index.html b/app/index.html
@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Mantrailling</title>
-  <meta name="description" content="">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Mantrailling</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  {{content-for 'head'}}
+    {{content-for 'head'}}
 
-  <link rel="stylesheet" href="assets/vendor.css">
-  <link rel="stylesheet" href="assets/mantrailling.css">
+    <link rel="stylesheet" href="assets/vendor.css">
+    <link rel="stylesheet" href="assets/mantrailling.css">
 
-  {{content-for 'head-footer'}}
-</head>
-<body>
-{{content-for 'body'}}
+    {{content-for 'head-footer'}}
+  </head>
+  <body>
+    {{content-for 'body'}}
 
-<script src="https://maps.googleapis.com/maps/api/js?libraries=places&key=AIzaSyBb1BipElNZJQPhdkSUdX5DxZpPnQV_D3k"></script>
-<script src="assets/vendor.js"></script>
-<script src="assets/mantrailling.js"></script>
+    <script src="https://maps.googleapis.com/maps/api/js?libraries=places&key=AIzaSyBb1BipElNZJQPhdkSUdX5DxZpPnQV_D3k"></script>
+    <script src="assets/vendor.js"></script>
+    <script src="assets/mantrailling.js"></script>
 
-{{content-for 'body-footer'}}
-</body>
+    {{content-for 'body-footer'}}
+  </body>
 </html>
diff --git a/app/initializers/map-command-initializer.js b/app/initializers/map-command-initializer.js
@@ -1,11 +1,12 @@
-import MapCmd from "../controllers/map-command.js";
+import MapCmd from "../controllers/map-command";
 
-export default {
-  name: 'map-command-initializer',
-  initialize: function(container, application) {
-    application.register('map-command-initializer:main', MapCmd, { instantiate: true });
-    application.inject('controller', 'command', 'map-command-initializer:main');
-    application.inject('model', 'command', 'map-command-initializer:main');
+export default({
+  name: 'map-command',
+
+  initialize: function(registry, application) {
+    application.register('map-command:main', MapCmd, { instantiate: true });
+    application.inject('controller', 'command', 'map-command:main');
+    application.inject('model', 'command', 'map-command:main');
   }
-};
+});
 
diff --git a/app/models/map-linestring.js b/app/models/map-linestring.js
@@ -2,10 +2,10 @@
  * Created by alex on 31/03/2015.
  */
 import DS from 'ember-data';
-import GeoJSON from '../models/geo-json.js';
-import xml2json from '../utils/xml2json.js';
-import json2xml from '../utils/json2xml.js';
-import consts from '../utils/map-constants.js';
+import GeoJSON from '../models/geo-json';
+import xml2json from '../utils/xml2json';
+import json2xml from '../utils/json2xml';
+import consts from '../utils/map-constants';
 
 export default GeoJSON.extend({
   gpx: DS.attr('string'), // XML GPS exchange format

diff --git a/app/models/map-point.js b/app/models/map-point.js
@@ -2,7 +2,7 @@
  * Created by alex on 31/03/2015.
  */
 import DS from 'ember-data';
-import GeoJSON from '../models/geo-json.js';
+import GeoJSON from '../models/geo-json';
 
 export default GeoJSON.extend({
   mapDraw: DS.belongsTo('mapDraw')

diff --git a/app/models/map-polygon.js b/app/models/map-polygon.js
@@ -2,7 +2,7 @@
  * Created by alex on 31/03/2015.
  */
 import DS from 'ember-data';
-import GeoJSON from '../models/geo-json.js';
+import GeoJSON from '../models/geo-json';
 
 export default GeoJSON.extend({
   mapDraw: DS.belongsTo('mapDraw')

diff --git a/app/models/map-style-color.js b/app/models/map-style-color.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/map-style-linestring.js b/app/models/map-style-linestring.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/map-style-point.js b/app/models/map-style-point.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/map-style-polygon.js b/app/models/map-style-polygon.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/map-style-stroke.js b/app/models/map-style-stroke.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/map-style-text.js b/app/models/map-style-text.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/mtg-style.js b/app/models/mtg-style.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/models/mtg-trail.js b/app/models/mtg-trail.js
@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import * as consts from '../utils/map-constants.js';
+import * as consts from '../utils/map-constants';
 
 /**
  * Created by alex on 31/03/2015.

diff --git a/app/templates/map-draw.hbs b/app/templates/map-draw.hbs
@@ -26,9 +26,9 @@
                   <li>
                       <table class="">
                           <tbody>
-                          {{#each row in colors}}
+                          {{#each colors as |row|}}
                               <tr class="">
-                                {{#each color in row}}
+                                {{#each row as |color|}}
                                     <td {{action 'changeColor' color}} {{bind-attr title=color}} class="color-picker"/>
                                 {{/each}}
                               </tr>

diff --git a/app/templates/map-layers.hbs b/app/templates/map-layers.hbs
@@ -9,12 +9,13 @@
                 </tr>
                 </thead>
                 <tbody>
-                {{#each layer in tileLayers itemController="mapLayer"}}
+                {{#each tileLayers as |layer|}}
+
                     <tr {{bind-attr id=layer.model.identifier}}>
                         <td class="layer-id">
-                            <label class="hint--top" {{bind-attr data-toggle="tooltip" data-original-title=layer.model.title}}>
+                            <label {{bind-attr data-toggle="tooltip" data-original-title=layer.title}}>
                               {{input type="checkbox" checked=layer.visible}}
-                              {{str-sub layer.model.title 20}}
+                              {{str-sub layer.title 20}}
                             </label>
                         </td>
                         <td>

diff --git a/app/templates/mtg-items.hbs b/app/templates/mtg-items.hbs
@@ -32,7 +32,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                {{#each item in selectedTrail.items itemController="mtgItem"}}
+                {{#each selectedTrail.items as |item|}}
                     <tr>
                         <td class="mtg-item-index-container">
                           {{item.model.index}}

diff --git a/app/templates/mtg-levels.hbs b/app/templates/mtg-levels.hbs
@@ -17,7 +17,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                {{#each level in levels}}
+                {{#each levels as |level|}}
                     <tr class={{if level.selected 'success' ''}}>
                         <td {{action 'changeLevel' level }}>
                           {{level.name}}