Merge pull request #1697 from Turbo87/angle-brackets

Use Angle Bracket Invocation Syntax
skylines-project · Oct 4, 2019 · 4af6a81 · 4af6a81
2 parents 9b20d0a + 1db933e
commit 4af6a81
Show file tree

Hide file tree

Showing 137 changed files with 972 additions and 979 deletions.
diff --git a/ember/app/templates/about/imprint.hbs b/ember/app/templates/about/imprint.hbs
@@ -1,4 +1,4 @@
-{{#base-page}}
+<BasePage>
   <div class="page-header">
     <h1>
       {{t "imprint"}}
@@ -10,4 +10,4 @@
       {{markdown model.content}}
     </div>
   </div>
-{{/base-page}}
+</BasePage>
diff --git a/ember/app/templates/about/license.hbs b/ember/app/templates/about/license.hbs
@@ -1,4 +1,4 @@
-{{#base-page}}
+<BasePage>
   <div class="page-header">
     <h1>
       {{t "license"}}
@@ -10,4 +10,4 @@
       <pre>{{model.content}}</pre>
     </div>
   </div>
-{{/base-page}}
+</BasePage>
diff --git a/ember/app/templates/about/team.hbs b/ember/app/templates/about/team.hbs
@@ -1,4 +1,4 @@
-{{#base-page}}
+<BasePage>
   <div class="page-header">
     <h1>
       {{t "the-skylines-team"}}
@@ -10,4 +10,4 @@
       {{markdown text}}
     </div>
   </div>
-{{/base-page}}
+</BasePage>
diff --git a/ember/app/templates/application.hbs b/ember/app/templates/application.hbs
@@ -1,9 +1,9 @@
-{{head-layout}}
+<HeadLayout />
 {{title "SkyLines"}}
 
 {{#if onFreestyleRoute}}
   {{outlet}}
 {{else}}
-  {{nav-bar onSearch=(action "search")}}
+  <NavBar @onSearch={{action "search"}} />
   {{outlet}}
 {{/if}}
diff --git a/ember/app/templates/club/edit.hbs b/ember/app/templates/club/edit.hbs
@@ -1,3 +1,3 @@
-{{#form-page title=(t "edit-club")}}
-  {{club-edit-form club=club}}
-{{/form-page}}
+<FormPage @title={{t "edit-club"}}>
+  <ClubEditForm @club={{club}} />
+</FormPage>
diff --git a/ember/app/templates/club/index.hbs b/ember/app/templates/club/index.hbs
@@ -1,4 +1,4 @@
-{{#base-page}}
+<BasePage>
   <div class="page-header">
     <h1>{{club.name}}</h1>
   </div>
@@ -24,7 +24,7 @@
               <th>{{t "created"}}</th>
               <td>
                 {{#if club.owner}}
-                  {{format-relative club.timeCreated}} by {{#link-to "user" club.owner.id}}{{club.owner.name}}{{/link-to}}
+                  {{format-relative club.timeCreated}} by <LinkTo @route="user" @model={{club.owner.id}}>{{club.owner.name}}</LinkTo>
                 {{else}}
                   {{format-relative club.timeCreated}}
                 {{/if}}
@@ -34,15 +34,15 @@
 
           <p>
             {{#if club.isWritable}}
-              {{#link-to "club.edit" club.id class="btn btn-default"}}{{t "edit"}}{{/link-to}}
+              <LinkTo @route="club.edit" @model={{club.id}} class="btn btn-default">{{t "edit"}}</LinkTo>
             {{/if}}
 
-            {{#link-to "flights.club" club.id class="btn btn-default"}}{{fa-icon "plane"}} {{t "flights"}}{{/link-to}}
-            {{#link-to "statistics.club" club.id class="btn btn-default"}}{{fa-icon "bar-chart"}} {{t "statistics"}}{{/link-to}}
-            {{#link-to "club.pilots" club.id class="btn btn-default"}}{{fa-icon "group"}} {{t "members"}}{{/link-to}}
+            <LinkTo @route="flights.club" @model={{club.id}} class="btn btn-default">{{fa-icon "plane"}} {{t "flights"}}</LinkTo>
+            <LinkTo @route="statistics.club" @model={{club.id}} class="btn btn-default">{{fa-icon "bar-chart"}} {{t "statistics"}}</LinkTo>
+            <LinkTo @route="club.pilots" @model={{club.id}} class="btn btn-default">{{fa-icon "group"}} {{t "members"}}</LinkTo>
           </p>
         </div>
       </div>
     </div>
   </div>
-{{/base-page}}
+</BasePage>
diff --git a/ember/app/templates/club/pilots.hbs b/ember/app/templates/club/pilots.hbs
@@ -1,4 +1,4 @@
-{{#base-page}}
+<BasePage>
   <div class="page-header">
     <h1>{{t "members-of-CLUB" htmlSafe=true club=club.name clubURL=(href-to "club" club.id)}}</h1>
   </div>
@@ -15,11 +15,11 @@
         {{#each model.users as |user|}}
           <tr>
             <td class="column-buttons">
-              {{#link-to "user" user.id}}{{user.name}}{{/link-to}}
+              <LinkTo @route="user" @model={{user.id}}>{{user.name}}</LinkTo>
 
               <div class="pull-right">
-                {{#link-to "flights.pilot" user.id class="btn btn-default btn-sm"}}{{fa-icon "plane"}} {{t "flights"}}{{/link-to}}
-                {{#link-to "statistics.pilot" user.id class="btn btn-default btn-sm"}}{{fa-icon "bar-chart"}} {{t "statistics"}}{{/link-to}}
+                <LinkTo @route="flights.pilot" @model={{user.id}} class="btn btn-default btn-sm">{{fa-icon "plane"}} {{t "flights"}}</LinkTo>
+                <LinkTo @route="statistics.pilot" @model={{user.id}} class="btn btn-default btn-sm">{{fa-icon "bar-chart"}} {{t "statistics"}}</LinkTo>
               </div>
             </td>
           </tr>
@@ -28,4 +28,4 @@
       </table>
     </div>
   </div>
-{{/base-page}}
+</BasePage>
diff --git a/ember/app/templates/clubs.hbs b/ember/app/templates/clubs.hbs
@@ -1,4 +1,4 @@
-{{#base-page}}
+<BasePage>
   <div class="page-header">
     <h1>{{t "clubs"}}</h1>
   </div>
@@ -15,12 +15,12 @@
         {{#each model.clubs as |club|}}
           <tr>
             <td class="column-buttons">
-              {{link-to club.name "club" club.id }}
+              <LinkTo @route="club" @model={{club.id}}>{{club.name}}</LinkTo>
 
               <div class="pull-right">
-                {{#link-to "flights.club" club.id class="btn btn-default btn-sm"}}{{fa-icon "plane"}} {{t "flights"}}{{/link-to}}
-                {{#link-to "statistics.club" club.id class="btn btn-default btn-sm hidden-xs-inline"}}{{fa-icon "bar-chart"}} {{t "statistics"}}{{/link-to}}
-                {{#link-to "club.pilots" club.id class="btn btn-default btn-sm hidden-xs-inline"}}{{fa-icon "group"}} {{t "members"}}{{/link-to}}
+                <LinkTo @route="flights.club" @model={{club.id}} class="btn btn-default btn-sm">{{fa-icon "plane"}} {{t "flights"}}</LinkTo>
+                <LinkTo @route="statistics.club" @model={{club.id}} class="btn btn-default btn-sm hidden-xs-inline">{{fa-icon "bar-chart"}} {{t "statistics"}}</LinkTo>
+                <LinkTo @route="club.pilots" @model={{club.id}} class="btn btn-default btn-sm hidden-xs-inline">{{fa-icon "group"}} {{t "members"}}</LinkTo>
               </div>
             </td>
           </tr>
@@ -29,4 +29,4 @@
       </table>
     </div>
   </div>
-{{/base-page}}
+</BasePage>
diff --git a/ember/app/templates/components/aircraft-model-select.hbs b/ember/app/templates/components/aircraft-model-select.hbs
@@ -1,12 +1,12 @@
-{{#power-select
-  options=modelsWithNull
-  selected=model
-  searchField="name"
-  onchange=(action "onChange")
-  as |model|}}
-    {{#if (eq model.id null)}}
-      [{{t 'unspecified'}}]
-    {{else}}
-      {{model.name}}
-    {{/if}}
-{{/power-select}}
+<PowerSelect
+  @options={{modelsWithNull}}
+  @selected={{model}}
+  @searchField="name"
+  @onchange={{action "onChange"}}
+as |model|>
+  {{#if (eq model.id null)}}
+    [{{t 'unspecified'}}]
+  {{else}}
+    {{model.name}}
+  {{/if}}
+</PowerSelect>
diff --git a/ember/app/templates/components/base-map.hbs b/ember/app/templates/components/base-map.hbs
@@ -1 +1 @@
-{{layer-switcher map=map}}
+<LayerSwitcher @map={{map}} />
diff --git a/ember/app/templates/components/base-page.hbs b/ember/app/templates/components/base-page.hbs
@@ -1,9 +1,9 @@
 {{yield}}
 
 <p class="footer">
-  &copy; {{link-to (t "the-skylines-team") "about.team"}}
+  &copy; <LinkTo @route="about.team">{{t "the-skylines-team"}}</LinkTo>
   -
-  {{link-to (t "imprint") "about.imprint"}}
+  <LinkTo @route="about.imprint">{{t "imprint"}}</LinkTo>
   -
   <a href="https://github.com/skylines-project/skylines/blob/master/PRIVACY.md" target="_blank"  rel="noopener">{{t "privacy-policy"}}</a>
 </p>
diff --git a/ember/app/templates/components/cesium-plane-models.hbs b/ember/app/templates/components/cesium-plane-models.hbs
@@ -1,5 +1,5 @@
 {{#each fixes as |fix|}}
   {{#if fix.coordinate}}
-    {{cesium-plane-model scene=scene coordinate=fix.coordinate heading=fix.heading}}
+    <CesiumPlaneModel @scene={{scene}} @coordinate={{fix.coordinate}} @heading={{fix.heading}} />
   {{/if}}
 {{/each}}
diff --git a/ember/app/templates/components/change-aircraft-form.hbs b/ember/app/templates/components/change-aircraft-form.hbs
@@ -1,26 +1,26 @@
 <form {{action "submit" on="submit"}}>
   {{#if error}}
-    {{#bs-alert type="danger" dismissible=false}}{{error}}{{/bs-alert}}
+    <BsAlert @type="danger" @dismissible={{false}}>{{error}}</BsAlert>
   {{/if}}
 
   <div class="form-group">
     <label class="control-label">{{t "aircraft-type"}}</label>
-    {{aircraft-model-select models=models modelId=modelId onChange=(action (mut modelId))}}
+    <AircraftModelSelect @models={{models}} @modelId={{modelId}} @onChange={{action (mut modelId)}} />
   </div>
 
-  {{validated-input
-    value=registration
-    validation=validations.attrs.registration
-    label=(t "registration")
-    disabled=saveTask.isRunning
-    didValidate=didValidate}}
+  <ValidatedInput
+    @value={{registration}}
+    @validation={{validations.attrs.registration}}
+    @label={{t "registration"}}
+    @disabled={{saveTask.isRunning}}
+    @didValidate={{didValidate}} />
 
-  {{validated-input
-    value=competitionId
-    validation=validations.attrs.competitionId
-    label=(t "competition-id")
-    disabled=saveTask.isRunning
-    didValidate=didValidate}}
+  <ValidatedInput
+    @value={{competitionId}}
+    @validation={{validations.attrs.competitionId}}
+    @label={{t "competition-id"}}
+    @disabled={{saveTask.isRunning}}
+    @didValidate={{didValidate}} />
 
   <button class="btn btn-primary btn-block" type="submit" disabled={{or saveTask.isRunning (not validations.isValid)}}>
     {{t (if saveTask.isRunning "changing" "change")}}

diff --git a/ember/app/templates/components/change-pilot-form.hbs b/ember/app/templates/components/change-pilot-form.hbs
@@ -1,32 +1,30 @@
 <form {{action "submit" on="submit"}}>
   {{#if error}}
-    {{#bs-alert type="danger" dismissible=false}}{{error}}{{/bs-alert}}
+    <BsAlert @type="danger" @dismissible={{false}}>{{error}}</BsAlert>
   {{/if}}
 
-  {{#validated-block label=(t "pilot") validation=validations.attrs.pilotId didValidate=didValidate}}
-    {{pilot-select clubMembers=clubMembers pilotId=pilotId onChange=(action (mut pilotId))}}
-  {{/validated-block}}
+  <ValidatedBlock @label={{t "pilot"}} @validation={{validations.attrs.pilotId}} @didValidate={{didValidate}}>
+    <PilotSelect @clubMembers={{clubMembers}} @pilotId={{pilotId}} @onChange={{action (mut pilotId)}} />
+  </ValidatedBlock>
 
   {{#if showPilotNameInput}}
-    {{validated-input
-      value=pilotName
-      validation=validations.attrs.pilotName
-      label=(t "pilot")
-      disabled=saveTask.isRunning
-      didValidate=didValidate}}
+    <ValidatedInput
+      @value={{pilotName}}
+      @validation={{validations.attrs.pilotName}}
+      @label={{t "pilot"}} @disabled={{saveTask.isRunning}}
+      @didValidate={{didValidate}} />
   {{/if}}
 
-  {{#validated-block label=(t "copilot") validation=validations.attrs.copilotId didValidate=didValidate}}
-    {{pilot-select clubMembers=clubMembers pilotId=copilotId onChange=(action (mut copilotId))}}
-  {{/validated-block}}
+  <ValidatedBlock @label={{t "copilot"}} @validation={{validations.attrs.copilotId}} @didValidate={{didValidate}}>
+    <PilotSelect @clubMembers={{clubMembers}} @pilotId={{copilotId}} @onChange={{action (mut copilotId)}} />
+  </ValidatedBlock>
 
   {{#if showCopilotNameInput}}
-    {{validated-input
-      value=copilotName
-      validation=validations.attrs.copilotName
-      label=(t "copilot")
-      disabled=saveTask.isRunning
-      didValidate=didValidate}}
+    <ValidatedInput
+      @value={{copilotName}}
+      @validation={{validations.attrs.copilotName}}
+      @label={{t "copilot"}} @disabled={{saveTask.isRunning}}
+      @didValidate={{didValidate}} />
   {{/if}}
 
   <button class="btn btn-primary btn-block" type="submit" disabled={{or saveTask.isRunning (not validations.isValid)}}>

diff --git a/ember/app/templates/components/circling-performance-table.hbs b/ember/app/templates/components/circling-performance-table.hbs
@@ -5,9 +5,9 @@
     <th class='numeric'>{{t "count"}}<br/>{{t "avg-vario-abbr"}}</th>
     <th class='numeric'>{{t "duration"}}<br/>&Delta;H</th>
   </tr>
-  {{#if total}}{{circling-performance-row perf=total}}{{/if}}
-  {{#if left}}{{circling-performance-row perf=left}}{{/if}}
-  {{#if right}}{{circling-performance-row perf=right}}{{/if}}
-  {{#if mixed}}{{circling-performance-row perf=mixed}}{{/if}}
+  {{#if total}}<CirclingPerformanceRow @perf={{total}} />{{/if}}
+  {{#if left}}<CirclingPerformanceRow @perf={{left}} />{{/if}}
+  {{#if right}}<CirclingPerformanceRow @perf={{right}} />{{/if}}
+  {{#if mixed}}<CirclingPerformanceRow @perf={{mixed}} />{{/if}}
   </tbody>
 </table>
diff --git a/ember/app/templates/components/club-edit-form.hbs b/ember/app/templates/components/club-edit-form.hbs
@@ -1,21 +1,19 @@
 <form {{action "submit" on="submit"}}>
   {{#if error}}
-    {{#bs-alert type="danger" dismissible=false}}{{error}}{{/bs-alert}}
+    <BsAlert @type="danger" @dismissible={{false}}>{{error}}</BsAlert>
   {{/if}}
 
-  {{validated-input
-    value=name
-    validation=validations.attrs.name
-    label=(t "name")
-    disabled=saveTask.isRunning
-    didValidate=didValidate}}
+  <ValidatedInput
+    @value={{name}}
+    @validation={{validations.attrs.name}}
+    @label={{t "name"}} @disabled={{saveTask.isRunning}}
+    @didValidate={{didValidate}} />
 
-  {{validated-input
-    value=website
-    validation=validations.attrs.website
-    label=(t "website")
-    disabled=saveTask.isRunning
-    didValidate=didValidate}}
+  <ValidatedInput
+    @value={{website}}
+    @validation={{validations.attrs.website}}
+    @label={{t "website"}} @disabled={{saveTask.isRunning}}
+    @didValidate={{didValidate}} />
 
   <button class="btn btn-primary btn-block" type="submit" disabled={{or saveTask.isRunning (not validations.isValid)}}>
     {{t (if saveTask.isRunning "editing" "edit")}}

diff --git a/ember/app/templates/components/comments-list.hbs b/ember/app/templates/components/comments-list.hbs
@@ -5,7 +5,7 @@
         <td>
           {{#if comment.user}}
             <span style="float:left">
-              {{link-to comment.user.name "user" comment.user.id}}:&nbsp;
+              <LinkTo @route="user" @model={{comment.user.id}}>{{comment.user.name}}</LinkTo>:&nbsp;
             </span>
           {{/if}}
 
@@ -22,7 +22,7 @@
       <tr>
         <td>
           <form {{action (perform addCommentTask) on="submit"}}>
-            {{textarea value=addCommentText class="form-control" disabled=addCommentTask.isRunning}}<br/>
+            <Textarea @value={{addCommentText}} class="form-control" @disabled={{addCommentTask.isRunning}} /><br/>
             <input type="submit" value={{t "add-comment"}} class="btn btn-primary" disabled={{addCommentTask.isRunning}}/>
           </form>
         </td>

diff --git a/ember/app/templates/components/contest-layer.hbs b/ember/app/templates/components/contest-layer.hbs
@@ -1,5 +1,5 @@
 {{#each contests as |contest|}}
   {{#if contest}}
-    {{contest-layer-feature source=source contest=contest}}
+    <ContestLayerFeature @source={{source}} @contest={{contest}} />
   {{/if}}
 {{/each}}
diff --git a/ember/app/templates/components/fix-table.hbs b/ember/app/templates/components/fix-table.hbs
@@ -1,12 +1,12 @@
 <table id="fix-data" class="table table-condensed">
   <tbody>
     {{#each data as |row|}}
-      {{fix-table-row
-        row=row
-        selectable=selectable
-        selected=(and selectable (eq row.id selection))
-        onSelect=(action "select")
-        onRemove=onRemove}}
+      <FixTableRow
+        @row={{row}}
+        @selectable={{selectable}}
+        @selected={{and selectable (eq row.id selection)}}
+        @onSelect={{action "select"}}
+        @onRemove={{onRemove}} />
     {{/each}}
   </tbody>
 </table>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{{layer-switcher map=map}}
		<LayerSwitcher @map={{map}} />