fix some code styles

buildbot · Aug 1, 2015 · 4f31ca1 · 4f31ca1
1 parent 5928d5c
commit 4f31ca1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/www/md_base/src/app/builds/builder/builder.controller.coffee b/www/md_base/src/app/builds/builder/builder.controller.coffee
@@ -41,13 +41,12 @@ class Builder extends Controller
             @selectedTab = 1
 
     loadMoreBuilderInfo: ->
-        @moreInfo = {}
-
-        @moreInfo.tags = @info.tags
-        @moreInfo.description = @info.description
-        @moreInfo.slaves = @info.loadBuildslaves().getArray()
-        @moreInfo.masters = @info.loadMasters().getArray()
-        @moreInfo.forceschedulers = @forceschedulers
+        @moreInfo =
+            tags: @info.tags
+            description: @info.description
+            slaves: @info.loadBuildslaves().getArray()
+            masters: @info.loadMasters().getArray()
+            forceschedulers: @forceschedulers
 
     triggerSchedulerDialog: (scheduler, event) ->
         @$mdDialog.show
@@ -78,18 +77,18 @@ class Builder extends Controller
         opened.closeOnDestroy($scope)
 
         @builderid = $state.params.builderid
-        @dataService.getBuilders(builderid: @builderid).then (data) =>
+        @dataService.getBuilders(@builderid).then (data) =>
             if data.length == 0
                 alert 'Builder not found!'
                 $state.go('builds')
             else
                 @info = data[0]
                 @forceschedulers = @info.loadForceschedulers().getArray()
-                @builds = @info.loadBuilds(
+                @builds = @info.loadBuilds
                     builderid: @builderid
                     order: '-number'
                     limit: 20
-                ).getArray()
+                .getArray()
                 @loadMoreBuilderInfo()
 
                 # go to buildstab if no child state is selected

diff --git a/www/md_base/src/app/builds/builder/forcedialog/forcedialog.controller.coffee b/www/md_base/src/app/builds/builder/forcedialog/forcedialog.controller.coffee
@@ -28,7 +28,7 @@ class ForceDialog extends Controller
             jsonrpc: '2.0'
             method: 'force'
             params: param
-        res.then (=> @forceBuildSuccess()), ((data) => @forceBuildFail(data.error))
+        res.then (=> @forceBuildSuccess()), (data) => @forceBuildFail(data.error)
 
     constructor: (@builder, @scheduler, @dataService, @restService, @$mdDialog) ->
         parseFields = (field) =>

diff --git a/www/md_base/src/app/common/directives/buildinfo/buildinfo.directive.coffee b/www/md_base/src/app/common/directives/buildinfo/buildinfo.directive.coffee
@@ -25,22 +25,19 @@ class _BuildInfo extends Controller
             @changes = changes
             @change_owners = @processOwners(_.uniq(change.author for change in changes))
 
-            console.log @change_owners
-
             @build.loadProperties().then (data) =>
                 @processProperties(data[0])
 
-    processOwners: (owners) ->
+    processOwners: (owners = []) ->
         emailRegex = /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*/
-        return (
-            for owner in owners
-                email = emailRegex.exec(owner) || ['']
-
+        return _.map owners, (owner) ->
+            email = emailRegex.exec(owner) || ['']
+            return {
                 name: owner
                 email: email[0]
-            )
+            }
 
-    processProperties: (data) ->
+    processProperties: (data = {}) ->
         raw = {}
         for k, v of data
             raw[k] = {value: v[0], source: v[1]} if v and v.length == 2
@@ -52,7 +49,7 @@ class _BuildInfo extends Controller
         display.revision = (raw.got_revision?.value || raw.revision?.value || '')[0..20]
         display.slave = raw.slavename?.value
         display.scheduler = raw.scheduler?.value
-        display.dir = (raw.builddir?.value || raw.worddir?.value)
+        display.dir = raw.builddir?.value || raw.worddir?.value
 
         @properties = display