Skip to content

Commit a25fd00

Browse files
tardyptardyp
committed
upgrade dependencies
fix contextual button bug while we are at it
1 parent a5237a9 commit a25fd00

File tree

13 files changed

+28
-22
lines changed

13 files changed

+28
-22
lines changed

‎master/buildbot/newsfragments/context_buttons.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix issues in UI with contextual buttons which stayed after changing the page.

‎master/buildbot/newsfragments/upgrade_angular.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade frontend libraries dependencies (``angular 1.6, jquery 3, ui-router 1.0``).

‎www/base/guanlecoja/config.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77
gulp = require("gulp")
88
path = require("path")
99
shell = require("gulp-shell")
@@ -30,7 +30,7 @@ config =
3030
# JavaScript libraries (order matters)
3131
deps:
3232
"guanlecoja-ui":
33-
version: '~1.6.2'
33+
version: '~1.7.0'
3434
files: ['vendors.js', 'scripts.js']
3535
moment:
3636
version: "~2.6.0"

‎www/base/src/app/app.route.coffee

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
class Route extends Config
2-
constructor: ($urlRouterProvider, glMenuServiceProvider, config) ->
2+
constructor: ($urlRouterProvider, glMenuServiceProvider, $locationProvider, $compileProvider, config) ->
3+
# angularjs 1.6 sets ! as default prefix, but this would break all our URLs!
4+
$locationProvider.hashPrefix('')
5+
$compileProvider.preAssignBindingsEnabled(true)
36
$urlRouterProvider.otherwise('/')
47
# the app title needs to be < 18 chars else the UI looks bad
58
# we try to find best option

‎www/base/src/app/app.run.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
class RouteChangeListener extends Run
2-
constructor: ($rootScope, $log, config, glNotificationService) ->
2+
constructor: ($log, config, glNotificationService, $transitions, glTopbarContextualActionsService) ->
33
# fire an event related to the current route
4-
$rootScope.$on '$routeChangeSuccess', (event, currentRoute, priorRoute) ->
5-
$rootScope.$broadcast "#{currentRoute.controller}$routeChangeSuccess",
6-
currentRoute, priorRoute
4+
$transitions.onStart { }, (trans) ->
5+
glTopbarContextualActionsService.setContextualActions([])
6+
77
if config.on_load_warning?
88
setTimeout ->
99
glNotificationService.notify(msg:config.on_load_warning)

‎www/base/src/app/common/directives/buildsummary/buildsummary.directive.coffee

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ class _buildsummary extends Controller('common')
3333
ONLY_NOT_SUCCESS = 1
3434
EVERYTHING = 2
3535
details = EVERYTHING
36-
if @condensed
37-
details = NONE
36+
$scope.$watch "buildsummary.condensed", (condensed)->
37+
if condensed
38+
details = NONE
3839
@toggleDetails = ->
3940
details = (details + 1) % 3
4041

‎www/codeparameter/guanlecoja/config.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77
gulp = require("gulp")
88

99
gulp.task "copyace", ->

‎www/console_view/guanlecoja/config.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77
module.exports =
88

99
### ###########################################################################################
@@ -14,7 +14,7 @@ module.exports =
1414
bower:
1515
testdeps:
1616
"guanlecoja-ui":
17-
version: '~1.6.0'
17+
version: '~1.7.0'
1818
files: ['vendors.js', 'scripts.js']
1919
"angular-mocks":
2020
version: ANGULAR_TAG

‎www/data_module/guanlecoja/config.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77

88
gulp = require('gulp')
99
require("shelljs/global")
@@ -13,7 +13,7 @@ gulp.task "publish", ['default'], ->
1313
exec "git clone [email protected]:buildbot/buildbot-data-js.git"
1414
bower_json =
1515
name: "buildbot-data"
16-
version: "2.2.0"
16+
version: "2.2.1"
1717
main: ["buildbot-data.js"]
1818
moduleType: [],
1919
license: "MIT",

‎www/data_module/src/services/rest/rest.service.coffee

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ class Rest extends Service
44
execute: (config) ->
55
$q (resolve, reject) ->
66
$http(config)
7-
.success (response) ->
7+
.then (response) ->
88
try
9-
data = angular.fromJson(response)
9+
data = angular.fromJson(response.data)
1010
resolve(data)
1111
catch e
1212
reject(e)
13-
.error (reason) -> reject(reason)
13+
, (response) -> reject(response.data)
1414

1515
get: (url, params = {}) ->
1616
canceller = $q.defer()

‎www/nestedexample/guanlecoja/config.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77

88
config =
99

‎www/waterfall_view/guanlecoja/config.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77
module.exports =
88

99
### ###########################################################################################
@@ -15,7 +15,7 @@ module.exports =
1515
testdeps:
1616
# vendors.js includes jquery, angularjs, etc in the right order
1717
"guanlecoja-ui":
18-
version: '~1.6.0'
18+
version: '~1.7.0'
1919
files: ['vendors.js', 'scripts.js']
2020
"angular-mocks":
2121
version: ANGULAR_TAG

‎www/wsgi_dashboards/guanlecoja/config.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This module contains all configuration for the build process
44
#
55
### ###############################################################################################
6-
ANGULAR_TAG = "~1.5.3"
6+
ANGULAR_TAG = "~1.6.3"
77
module.exports =
88

99
### ###########################################################################################
@@ -15,7 +15,7 @@ module.exports =
1515
testdeps:
1616
# vendors.js includes jquery, angularjs, etc in the right order
1717
"guanlecoja-ui":
18-
version: '~1.6.0'
18+
version: '~1.7.0'
1919
files: ['vendors.js', 'scripts.js']
2020
"angular-mocks":
2121
version: ANGULAR_TAG

0 commit comments

Comments
 (0)