From 66be22af684c719d58a975c9e942d1ff223d52cc Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 23 Dec 2014 15:45:53 +0100
Subject: [PATCH] Fix actions on views

Almost all actions on views were not properly handled, because they were still
methods directly on a view object rather than in `actions` property. This commit
fixes it.
---
 assets/scripts/app/controllers/flash.coffee   |  13 +-
 assets/scripts/app/templates/jobs/list.hbs    |   4 +-
 assets/scripts/app/templates/jobs/pre.hbs     |   4 +-
 .../scripts/app/templates/layouts/flash.hbs   |   2 +-
 .../scripts/app/templates/layouts/profile.hbs |   2 +-
 .../scripts/app/templates/repos/list/tabs.hbs |   2 +-
 assets/scripts/app/templates/repos/show.hbs   |   2 +-
 .../app/templates/repos/show/actions.hbs      |  10 +-
 .../app/templates/repos/show/tools.hbs        |  14 +-
 .../scripts/app/templates/status_images.hbs   |   2 +-
 assets/scripts/app/templates/workers/list.hbs |   4 +-
 assets/scripts/app/views.coffee               |   4 +
 assets/scripts/app/views/flash.coffee         |   5 +-
 assets/scripts/app/views/repo/show.coffee     | 135 +++++++++---------
 assets/scripts/app/views/status_images.coffee |   5 +-
 15 files changed, 108 insertions(+), 100 deletions(-)

diff --git a/assets/scripts/app/controllers/flash.coffee b/assets/scripts/app/controllers/flash.coffee
index 9b857656..8a10eaae 100644
--- a/assets/scripts/app/controllers/flash.coffee
+++ b/assets/scripts/app/controllers/flash.coffee
@@ -30,10 +30,11 @@ Travis.FlashController = Ember.ArrayController.extend
       @get('flashes').unshiftObject(msg)
       Ember.run.later(this, (-> @get('flashes.content').removeObject(msg)), 15000)
 
-  close: (msg) ->
-    if msg instanceof Travis.Broadcast
-      msg.setSeen()
-      @notifyPropertyChange('unseenBroadcasts')
-    else
-      @get('flashes').removeObject(msg)
+  actions:
+    close: (msg) ->
+      if msg instanceof Travis.Broadcast
+        msg.setSeen()
+        @notifyPropertyChange('unseenBroadcasts')
+      else
+        @get('flashes').removeObject(msg)
 
diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs
index d576baee..c122243f 100644
--- a/assets/scripts/app/templates/jobs/list.hbs
+++ b/assets/scripts/app/templates/jobs/list.hbs
@@ -7,7 +7,7 @@
   {{else}}
     <caption>
       Allowed Failures
-      <a title="What's this?" class="help open-popup" name="help-allowed_failures" {{action "popup" target="view"}}></a>
+      <a title="What's this?" class="help open-popup" name="help-allowed_failures" {{action "popup" target=view}}></a>
     </caption>
   {{/if}}
     <thead>
@@ -44,7 +44,7 @@
 
   {{#unless view.required}}
     <div id="help-allowed_failures" class="popup">
-      <a href="#" class="close" {{action "popupClose" target="view"}}></a>
+      <a href="#" class="close" {{action "popupClose" target=view}}></a>
       <h4></h4>
       <p>
         Allowed Failures are items in your build matrix that are allowed to
diff --git a/assets/scripts/app/templates/jobs/pre.hbs b/assets/scripts/app/templates/jobs/pre.hbs
index 3fdd42af..290b7c36 100644
--- a/assets/scripts/app/templates/jobs/pre.hbs
+++ b/assets/scripts/app/templates/jobs/pre.hbs
@@ -1,5 +1,5 @@
 <div id="log-container">
-  <a href="#" id="tail" {{action "toggleTailing" target="view"}}>
+  <a href="#" id="tail" {{action "toggleTailing" target=view}}>
     <span class="status"></span>
 
     <label>
@@ -12,7 +12,7 @@
   </a>
   <pre id="log" class="ansi"></pre>
 
-  <a href='#' class="to-top" {{action "toTop" target="view"}}>To Top</a>
+  <a href='#' class="to-top" {{action "toTop" target=view}}>To Top</a>
 
   {{#if view.job.sponsor.name}}
     <p class="sponsor">
diff --git a/assets/scripts/app/templates/layouts/flash.hbs b/assets/scripts/app/templates/layouts/flash.hbs
index ccbabee6..193d0d8c 100644
--- a/assets/scripts/app/templates/layouts/flash.hbs
+++ b/assets/scripts/app/templates/layouts/flash.hbs
@@ -1,6 +1,6 @@
 {{#each flash in controller}}
   {{#view Travis.FlashItemView flashBinding="flash"}}
     <p>{{{flash.message}}}</p>
-    <a class="close" {{action "close" target="view"}}></a>
+    <a class="close" {{action "close" target=view}}></a>
   {{/view}}
 {{/each}}
diff --git a/assets/scripts/app/templates/layouts/profile.hbs b/assets/scripts/app/templates/layouts/profile.hbs
index 80759385..736b3899 100644
--- a/assets/scripts/app/templates/layouts/profile.hbs
+++ b/assets/scripts/app/templates/layouts/profile.hbs
@@ -12,7 +12,7 @@
 </div>
 
 <div id="right">
-  <div id="slider" {{action "toggle" target="Travis.slider"}}>
+  <div id="slider" {{action "toggle" target=Travis.slider}}>
     <div class='icon'></div>&nbsp;
   </div>
 
diff --git a/assets/scripts/app/templates/repos/list/tabs.hbs b/assets/scripts/app/templates/repos/list/tabs.hbs
index 00d183bf..724e7f75 100644
--- a/assets/scripts/app/templates/repos/list/tabs.hbs
+++ b/assets/scripts/app/templates/repos/list/tabs.hbs
@@ -8,7 +8,7 @@
   </li>
 
   <li id="tab_search" {{bind-attr class="view.classSearch"}}>
-    <h5><a {{action "activate" "search"}}>Search</a></h5>
+    <h5>Search</h5>
   </li>
 
   <li id="tab_new" {{bind-attr class="view.classNew"}}>
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index 5b359522..0be0cf77 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -7,7 +7,7 @@
         <h3>{{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}</h3>
         <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.svg" width="21" height="21"/></a></div>
         <div class="status-image">
-          <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}>
+          <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target=view}}>
           <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
           </a>
         </div>
diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs
index 183ee63c..de829fab 100644
--- a/assets/scripts/app/templates/repos/show/actions.hbs
+++ b/assets/scripts/app/templates/repos/show/actions.hbs
@@ -2,13 +2,13 @@
   <ul>
     {{#if view.displayCancelBuild}}
       <li class="icon cancel-build" title="Cancel Build">
-        <a href="#" {{action "cancelBuild" target="view"}}
+        <a href="#" {{action "cancelBuild" target=view}}
           {{bind-attr class="view.canCancelBuild::disabled"}}></a>
       </li>
     {{/if}}
     {{#if view.displayCancelJob}}
       <li class="icon cancel-job" title="Cancel Job">
-        <a href="#" {{action "cancelJob" target="view"}}
+        <a href="#" {{action "cancelJob" target=view}}
           {{bind-attr class="view.canCancelJob::disabled"}}></a>
       </li>
     {{/if}}
@@ -17,7 +17,7 @@
         {{#if view.requeueing}}
           <span class="icon loading"></span>
         {{else}}
-          <a href="#" {{action "requeueBuild" target="view"}}
+          <a href="#" {{action "requeueBuild" target=view}}
             {{bind-attr class="view.canRequeueBuild::disabled"}}></a>
         {{/if}}
       </li>
@@ -27,7 +27,7 @@
         {{#if view.requeueing}}
           <span class="icon loading"></span>
         {{else}}
-          <a href="#" {{action "requeueJob" target="view"}}
+          <a href="#" {{action "requeueJob" target=view}}
             {{bind-attr class="view.canRequeueJob::disabled"}}></a>
         {{/if}}
       </li>
@@ -42,7 +42,7 @@
     {{#if view.displayCodeClimate}}
       <li class="icon code-climate" title="Test Coverage with Code Climate">
         <a href="#" name="code-climate"
-          {{action "codeClimatePopup" target="view"}}
+          {{action "codeClimatePopup" target=view}}
           {{bind-attr class=":open-popup"}}></a>
       </li>
     {{/if}}
diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs
index a70717fc..3bf4bd8a 100644
--- a/assets/scripts/app/templates/repos/show/tools.hbs
+++ b/assets/scripts/app/templates/repos/show/tools.hbs
@@ -1,11 +1,11 @@
 <div id="tools">
-  <a href="#" {{action "menu" target="view"}} class="menu-popup-button">Settings</a>
+  <a href="#" {{action "menu" target=view}} class="menu-popup-button">Settings</a>
 
   <ul class="menu">
    {{#if view.displayRegenerateKey}}
       <li>
         <a href="#" name="regenerate-key"
-          {{action "regenerateKeyPopup" target="view"}}
+          {{action "regenerateKeyPopup" target=view}}
           {{bind-attr class=":open-popup view.canRegenerateKey::disabled"}}>
             Regenerate Key
         </a>
@@ -29,7 +29,7 @@
 </div>
 
 <div id="regenerate-key" class="popup">
-  <a href="#" class="close" {{action "popupClose" target="view"}}></a>
+  <a href="#" class="close" {{action "popupClose" target=view}}></a>
   <p>
     Do you really want to regenerate ssl keys for this repository? Please note that
     any data, which is encrypted, such as notification services credentials or secure
@@ -38,14 +38,14 @@
   </p>
 
   <p>
-    <a class="sync_now button" {{action "regenerateKey" target="view"}}>Yes, do it!</a>
+    <a class="sync_now button" {{action "regenerateKey" target=view}}>Yes, do it!</a>
     <span class="or">or</span>
-    <a href="#" class="cancel" {{action "popupClose" target="view"}}>Cancel</a>
+    <a href="#" class="cancel" {{action "popupClose" target=view}}>Cancel</a>
   </p>
 </div>
 
 <div id="regeneration-success" class="popup">
-  <a href="#" class="close" {{action "popupClose" target="view"}}></a>
+  <a href="#" class="close" {{action "popupClose" target=view}}></a>
   <p>
     Key for this repository has been regenerated. If you used previous key
     for encryption, you will need encrypt your data again with the new key.
@@ -58,7 +58,7 @@
 
 <div id="code-climate" class="popup">
   <img src="/images/icons/code-climate-logo.svg" id="code-climate-logo"/>
-  <a href="#" class="close" {{action "popupClose" target="view"}}></a>
+  <a href="#" class="close" {{action "popupClose" target=view}}></a>
   <p>
     <b>Want test coverage for your tests?</b>
   </p>
diff --git a/assets/scripts/app/templates/status_images.hbs b/assets/scripts/app/templates/status_images.hbs
index 2b103afe..677e2ca3 100644
--- a/assets/scripts/app/templates/status_images.hbs
+++ b/assets/scripts/app/templates/status_images.hbs
@@ -1,4 +1,4 @@
-<a href="#" class="close" {{action "close" target="view"}}></a>
+<a href="#" class="close" {{action "close" target=view}}></a>
 <p>
   <label>Branch:</label>
   {{#if view.branches.isLoaded}}
diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs
index a9387fe9..9edba910 100644
--- a/assets/scripts/app/templates/workers/list.hbs
+++ b/assets/scripts/app/templates/workers/list.hbs
@@ -1,10 +1,10 @@
 {{#view Travis.WorkersView}}
-  <a id="toggle-workers" {{action "toggleWorkers" target="view"}}></a>
+  <a id="toggle-workers" {{action "toggleWorkers" target=view}}></a>
   <ul id="workers">
     {{#each group in controller.groups}}
       {{#view Travis.WorkersListView}}
         <li class="group">
-          <h5 {{action "toggle" target="view"}}>
+          <h5 {{action "toggle" target=view}}>
             {{group.firstObject.host}}
           </h5>
           <ul>
diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee
index 327d0bd6..6478c128 100644
--- a/assets/scripts/app/views.coffee
+++ b/assets/scripts/app/views.coffee
@@ -8,6 +8,10 @@ Em.View.reopen
 
 @Travis.reopen
   View: Em.View.extend
+    actions:
+      popup: (name) -> @popup(name)
+      popupClose: -> @popupClose()
+
     popup: (name) ->
       @popupCloseAll()
       name = event?.target?.name || name
diff --git a/assets/scripts/app/views/flash.coffee b/assets/scripts/app/views/flash.coffee
index 6801d39e..3901b187 100644
--- a/assets/scripts/app/views/flash.coffee
+++ b/assets/scripts/app/views/flash.coffee
@@ -12,5 +12,6 @@
       @get('flash.type') || 'broadcast'
     ).property('flash.type')
 
-    close: ->
-      @get('controller').close(@get('flash'))
+    actions:
+      close: ->
+        @get('controller').close(@get('flash'))
diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee
index 7dcb358e..a3ce45fb 100644
--- a/assets/scripts/app/views/repo/show.coffee
+++ b/assets/scripts/app/views/repo/show.coffee
@@ -106,26 +106,27 @@ Travis.reopen
     closeMenu: ->
       $('.menu').removeClass('display')
 
-    menu: ->
-      @popupCloseAll()
-      $('#tools .menu').toggleClass('display')
-      event.stopPropagation()
-
-    regenerateKeyPopup: ->
-      if @get('canRegenerateKey')
-        @set('active', true)
-        @closeMenu()
-        @popup(event)
+    actions:
+      menu: ->
+        @popupCloseAll()
+        $('#tools .menu').toggleClass('display')
         event.stopPropagation()
 
-    regenerateKey: ->
-      @popupCloseAll()
+      regenerateKeyPopup: ->
+        if @get('canRegenerateKey')
+          @set('active', true)
+          @closeMenu()
+          @popup(event)
+          event.stopPropagation()
 
-      (@get('repo.content') || @get('repo')).regenerateKey
-        success: =>
-          @popup('regeneration-success')
-        error: ->
-          Travis.lookup('controller:flash').loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}])
+      regenerateKey: ->
+        @popupCloseAll()
+
+        (@get('repo.content') || @get('repo')).regenerateKey
+          success: =>
+            @popup('regeneration-success')
+          error: ->
+            Travis.lookup('controller:flash').loadFlashes([{ error: 'Travis encountered an error while trying to regenerate the key, please try again.'}])
 
     canRegenerateKey: (->
       @get('hasAdminPermission')
@@ -167,45 +168,59 @@ Travis.reopen
     tabBinding: 'controller.tab'
     currentUserBinding: 'controller.currentUser'
 
-    cancelBuild: ->
-      if @get('canCancelBuild')
-        Travis.flash(notice: 'Build cancellation has been scheduled.')
-        @get('build').cancel().then ->
-          Travis.flash(success: 'Build has been successfully canceled.')
-        , (xhr) ->
-          if xhr.status == 422
-            Travis.flash(error: 'This build can\'t be canceled')
-          else if xhr.status == 403
-            Travis.flash(error: 'You don\'t have sufficient access to cancel this build')
-          else
-            Travis.flash(error: 'An error occured when canceling the build')
+    actions:
+      requeueBuild: ->
+        if @get('canRequeueBuild')
+          @requeue @get('build')
+
+      requeueJob: ->
+        if @get('canRequeueJob')
+          @requeue @get('job')
+
+      cancelBuild: ->
+        if @get('canCancelBuild')
+          Travis.flash(notice: 'Build cancellation has been scheduled.')
+          @get('build').cancel().then ->
+            Travis.flash(success: 'Build has been successfully canceled.')
+          , (xhr) ->
+            if xhr.status == 422
+              Travis.flash(error: 'This build can\'t be canceled')
+            else if xhr.status == 403
+              Travis.flash(error: 'You don\'t have sufficient access to cancel this build')
+            else
+              Travis.flash(error: 'An error occured when canceling the build')
 
 
-    removeLog: ->
-      if @get('canRemoveLog')
-        job = @get('job') || @get('build.jobs.firstObject')
-        job.removeLog().then ->
-          Travis.flash(success: 'Log has been successfully removed.')
-        , (xhr) ->
-          if xhr.status == 409
-            Travis.flash(error: 'Log can\'t be removed')
-          else if xhr.status == 401
-            Travis.flash(error: 'You don\'t have sufficient access to remove the log')
-          else
-            Travis.flash(error: 'An error occured when removing the log')
+      removeLog: ->
+        if @get('canRemoveLog')
+          job = @get('job') || @get('build.jobs.firstObject')
+          job.removeLog().then ->
+            Travis.flash(success: 'Log has been successfully removed.')
+          , (xhr) ->
+            if xhr.status == 409
+              Travis.flash(error: 'Log can\'t be removed')
+            else if xhr.status == 401
+              Travis.flash(error: 'You don\'t have sufficient access to remove the log')
+            else
+              Travis.flash(error: 'An error occured when removing the log')
 
-    cancelJob: ->
-      if @get('canCancelJob')
-        Travis.flash(notice: 'Job cancellation has been scheduled.')
-        @get('job').cancel().then ->
-          Travis.flash(success: 'Job has been successfully canceled.')
-        , (xhr) ->
-          if xhr.status == 422
-            Travis.flash(error: 'This job can\'t be canceled')
-          else if xhr.status == 403
-            Travis.flash(error: 'You don\'t have sufficient access to cancel this job')
-          else
-            Travis.flash(error: 'An error occured when canceling the job')
+      cancelJob: ->
+        if @get('canCancelJob')
+          Travis.flash(notice: 'Job cancellation has been scheduled.')
+          @get('job').cancel().then ->
+            Travis.flash(success: 'Job has been successfully canceled.')
+          , (xhr) ->
+            if xhr.status == 422
+              Travis.flash(error: 'This job can\'t be canceled')
+            else if xhr.status == 403
+              Travis.flash(error: 'You don\'t have sufficient access to cancel this job')
+            else
+              Travis.flash(error: 'An error occured when canceling the job')
+
+      codeClimatePopup: ->
+        @popupCloseAll()
+        @popup('code-climate')
+        event.stopPropagation() if event?
 
     hasPermission: (->
       if permissions = @get('currentUser.permissions')
@@ -283,11 +298,6 @@ Travis.reopen
       Travis.config.code_climate == "true" and @get('repo.githubLanguage') == 'Ruby'
     ).property('repo.githubLanguage')
 
-    codeClimatePopup: ->
-      @popupCloseAll()
-      @popup('code-climate')
-      event.stopPropagation() if event?
-
     requeueFinished: ->
       @set('requeueing', false)
 
@@ -296,12 +306,3 @@ Travis.reopen
       @set('requeueing', true)
       thing.requeue().then(this.requeueFinished.bind(this), this.requeueFinished.bind(this))
 
-    requeueBuild: ->
-      if @get('canRequeueBuild')
-        @requeue @get('build')
-
-    requeueJob: ->
-      if @get('canRequeueJob')
-        @requeue @get('job')
-
-
diff --git a/assets/scripts/app/views/status_images.coffee b/assets/scripts/app/views/status_images.coffee
index a1a89e3c..f3e733e5 100644
--- a/assets/scripts/app/views/status_images.coffee
+++ b/assets/scripts/app/views/status_images.coffee
@@ -30,8 +30,9 @@ Travis.StatusImagesView = Em.View.extend
   show: ->
     @set('display', true)
 
-  close: ->
-    @destroy()
+  actions:
+    close: ->
+      @destroy()
 
   setStatusImageFormat: (->
     @set('statusImageFormat', @formats[0])