Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
9d4d6ce6
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9d4d6ce6
编写于
2月 15, 2016
作者:
P
Piotr Bryk
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #364 from bryk/compiler-fixes
Fix compiler and angular warnings/issues before update
上级
239ceb92
835ec51e
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
31 addition
and
52 deletion
+31
-52
src/app/frontend/common/components/labels/labels_controller.js
...pp/frontend/common/components/labels/labels_controller.js
+1
-1
src/app/frontend/common/filters/cores_filter.js
src/app/frontend/common/filters/cores_filter.js
+1
-1
src/app/frontend/common/filters/memory_filter.js
src/app/frontend/common/filters/memory_filter.js
+1
-1
src/app/frontend/common/filters/middleellipsis_filter.js
src/app/frontend/common/filters/middleellipsis_filter.js
+1
-1
src/app/frontend/common/filters/relativetime_filter.js
src/app/frontend/common/filters/relativetime_filter.js
+1
-1
src/app/frontend/deploy/createnamespace_controller.js
src/app/frontend/deploy/createnamespace_controller.js
+1
-1
src/app/frontend/deploy/deploy_controller.js
src/app/frontend/deploy/deploy_controller.js
+1
-9
src/app/frontend/deploy/deployfromfile_controller.js
src/app/frontend/deploy/deployfromfile_controller.js
+5
-2
src/app/frontend/deploy/deployfromfile_directive.js
src/app/frontend/deploy/deployfromfile_directive.js
+4
-0
src/app/frontend/deploy/deployfromsettings_controller.js
src/app/frontend/deploy/deployfromsettings_controller.js
+2
-2
src/app/frontend/deploy/deploylabel.js
src/app/frontend/deploy/deploylabel.js
+2
-2
src/app/frontend/deploy/deploylabel_controller.js
src/app/frontend/deploy/deploylabel_controller.js
+0
-8
src/app/frontend/deploy/filereader_directive.js
src/app/frontend/deploy/filereader_directive.js
+1
-1
src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail_controller.js
...ontrollerdetail/replicationcontrollerdetail_controller.js
+2
-9
src/app/frontend/replicationcontrollerdetail/sortedheader_controller.js
...nd/replicationcontrollerdetail/sortedheader_controller.js
+3
-0
src/app/frontend/replicationcontrollerdetail/updatereplicas_controller.js
.../replicationcontrollerdetail/updatereplicas_controller.js
+1
-5
src/app/frontend/replicationcontrollerlist/logsmenu_controller.js
...frontend/replicationcontrollerlist/logsmenu_controller.js
+1
-1
src/app/frontend/replicationcontrollerlist/replicationcontrollercardmenu_controller.js
...ontrollerlist/replicationcontrollercardmenu_controller.js
+2
-6
src/test/frontend/deploy/deploy_controller_test.js
src/test/frontend/deploy/deploy_controller_test.js
+1
-1
未找到文件。
src/app/frontend/common/components/labels/labels_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -21,7 +21,7 @@ export default class LabelsController {
* @ngInject
*/
constructor
()
{
/** @export {Object<string, string>} Initialized from the scope. */
/** @export {
!
Object<string, string>} Initialized from the scope. */
this
.
labels
;
}
}
src/app/frontend/common/filters/cores_filter.js
浏览文件 @
9d4d6ce6
...
...
@@ -21,7 +21,7 @@ const powerSuffixes = ['m', '', 'k', 'M', 'G'];
/**
* Returns filter function that formats cores usage.
* @param {function(number): string} numberFilter
* @return {
Function
}
* @return {
function(number): string
}
* @ngInject
*/
export
default
function
coresFilter
(
numberFilter
)
{
...
...
src/app/frontend/common/filters/memory_filter.js
浏览文件 @
9d4d6ce6
...
...
@@ -21,7 +21,7 @@ const powerSuffixes = ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi'];
/**
* Returns filter function that formats memory in bytes.
* @param {function(number): string} numberFilter
* @return {
Function
}
* @return {
function(number): string
}
* @ngInject
*/
export
default
function
memoryFilter
(
numberFilter
)
{
...
...
src/app/frontend/common/filters/middleellipsis_filter.js
浏览文件 @
9d4d6ce6
...
...
@@ -14,7 +14,7 @@
/**
* Returns filter function to apply middle ellipsis when string is longer then max parameter.
* @return {
Function
}
* @return {
function(string, number): string
}
*/
export
default
function
middleEllipsisFilter
()
{
/**
...
...
src/app/frontend/common/filters/relativetime_filter.js
浏览文件 @
9d4d6ce6
...
...
@@ -50,7 +50,7 @@ const TimeConstants = {
/**
* Returns filter function to display relative time since given date.
* @return {
Function
}
* @return {
function(string): string
}
*/
export
default
function
relativeTimeFilter
()
{
/**
...
...
src/app/frontend/deploy/createnamespace_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -60,7 +60,7 @@ export default class NamespaceDialogController {
/**
* Pattern validation rule for namespace
* @export {RegExp}
* @export {
!
RegExp}
*/
this
.
namespacePattern
=
new
RegExp
(
'
^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
'
);
...
...
src/app/frontend/deploy/deploy_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -23,14 +23,12 @@ import {
*/
export
default
class
DeployController
{
/**
* @param {!angular.$resource} $resource
* @param {!angular.$log} $log
* @param {!ui.router.$state} $state
* @param {!backendApi.NamespaceList} namespaces
* @param {!backendApi.Protocols} protocols
* @ngInject
*/
constructor
(
$
resource
,
$log
,
$
state
,
namespaces
,
protocols
)
{
constructor
(
$state
,
namespaces
,
protocols
)
{
/** @export {!angular.FormController} Initialized from the template */
this
.
deployForm
;
...
...
@@ -60,12 +58,6 @@ export default class DeployController {
*/
this
.
selection
=
"
Settings
"
;
/** @private {!angular.$resource} */
this
.
resource_
=
$resource
;
/** @private {!angular.$log} */
this
.
log_
=
$log
;
/** @private {!ui.router.$state} */
this
.
state_
=
$state
;
...
...
src/app/frontend/deploy/deployfromfile_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -27,7 +27,10 @@ export default class DeployFromFileController {
* @param {!ui.router.$state} $state
* @param {!angular.$resource} $resource
* @param {!angular.$q} $q
* @ngInject */
* TODO (cheld) Set correct type after fixing issue #159
* @param {!Object} errorDialog
* @ngInject
*/
constructor
(
$log
,
$state
,
$resource
,
$q
,
errorDialog
)
{
/**
* It initializes the scope output parameter
...
...
@@ -66,7 +69,7 @@ export default class DeployFromFileController {
* Deploys the application based on the state of the controller.
*
* @export
* @return {angular.$q.Promise}
* @return {
!
angular.$q.Promise}
*/
deploy
()
{
/** @type {!backendApi.AppDeploymentFromFileSpec} */
...
...
src/app/frontend/deploy/deployfromfile_directive.js
浏览文件 @
9d4d6ce6
...
...
@@ -14,6 +14,10 @@
import
DeployFromFileController
from
'
./deployfromfile_controller
'
;
/**
* Returns directive definition object for the deploy from file directive.
* @return {!angular.Directive}
*/
export
default
function
deployFromFileDirective
()
{
return
{
scope
:
{},
...
...
src/app/frontend/deploy/deployfromsettings_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -125,7 +125,7 @@ export default class DeployFromSettingsController {
* Checks that a name begins and ends with a lowercase letter
* and contains nothing but lowercase letters and hyphens ("-")
* (leading and trailing spaces are ignored by default)
* @export {RegExp}
* @export {
!
RegExp}
*/
this
.
namePattern
=
new
RegExp
(
'
^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
'
);
...
...
@@ -176,7 +176,7 @@ export default class DeployFromSettingsController {
/**
* Deploys the application based on the state of the controller.
*
* @return {angular.$q.Promise}
* @return {
!
angular.$q.Promise}
* @export
*/
deploy
()
{
...
...
src/app/frontend/deploy/deploylabel.js
浏览文件 @
9d4d6ce6
...
...
@@ -22,7 +22,7 @@ export default class DeployLabel {
* @param {string} key
* @param {string} value
* @param {boolean} editable
* @param {function(string): string} derivedValueGetterFn - callback
* @param {function(string): string
|undefined
} derivedValueGetterFn - callback
*/
constructor
(
key
=
''
,
value
=
''
,
editable
=
true
,
derivedValueGetterFn
=
undefined
)
{
/** @export {boolean} */
...
...
@@ -39,7 +39,7 @@ export default class DeployLabel {
}
/**
* @param {string} [newValue]
* @param {string
=
} [newValue]
* @return {string}
* @export
*/
...
...
src/app/frontend/deploy/deploylabel_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -126,14 +126,6 @@ export default class DeployLabelController {
return
duplications
>
1
;
}
/**
* Returns true if label key and value are empty, false otherwise.
* @param {!DeployLabel} label
* @return {boolean}
* @private
*/
isEmpty_
(
label
)
{
return
label
.
key
.
length
===
0
&&
label
.
value
().
length
===
0
;
}
/**
* Returns true if label key and value are not empty, false otherwise.
* @param {!DeployLabel} label
...
...
src/app/frontend/deploy/filereader_directive.js
浏览文件 @
9d4d6ce6
...
...
@@ -30,7 +30,7 @@ export default function fileReaderDirective($log) {
uploadController
.
registerBrowseFileFunction
(()
=>
(
element
[
0
].
click
()));
element
.
bind
(
'
change
'
,
(
changeEvent
)
=>
{
/** @type {File} */
/** @type {
?
File} */
let
file
=
changeEvent
.
target
.
files
[
0
];
if
(
!
file
)
{
$log
.
error
(
'
Error invalid file:
'
,
file
);
...
...
src/app/frontend/replicationcontrollerdetail/replicationcontrollerdetail_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -30,17 +30,15 @@ const EVENT_SOURCE_SYSTEM = 'System';
export
default
class
ReplicationControllerDetailController
{
/**
* @param {function(string):boolean} $mdMedia Angular Material $mdMedia service
* @param {!md.$dialog} $mdDialog
* @param {!./replicationcontrollerdetail_state.StateParams} $stateParams
* @param {!ui.router.$state} $state
* @param {!angular.$resource} $resource
* @param {!angular.$log} $log
* @param {!backendApi.ReplicationControllerDetail} replicationControllerDetail
* @param {!backendApi.Events} replicationControllerEvents
* @ngInject
*/
constructor
(
$mdMedia
,
$
mdDialog
,
$
stateParams
,
$state
,
$resource
,
$log
,
replicationControllerDetail
,
$mdMedia
,
$stateParams
,
$state
,
$resource
,
$log
,
replicationControllerDetail
,
replicationControllerEvents
)
{
/** @export {function(string):boolean} */
this
.
mdMedia
=
$mdMedia
;
...
...
@@ -72,12 +70,6 @@ export default class ReplicationControllerDetailController {
/** @private {!ui.router.$state} */
this
.
state_
=
$state
;
/** @private {!md.$dialog} */
this
.
mdDialog_
=
$mdDialog
;
/** @private {!angular.$resource} */
this
.
resource_
=
$resource
;
/** @private {!angular.$log} */
this
.
log_
=
$log
;
...
...
@@ -139,6 +131,7 @@ export default class ReplicationControllerDetailController {
}
/**
* @param {!backendApi.ReplicationControllerPod} pod
* @export
*/
getPodLogsHref
(
pod
)
{
...
...
src/app/frontend/replicationcontrollerdetail/sortedheader_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -29,6 +29,9 @@ export const DOWNWARDS = true;
* @final
*/
export
default
class
SortedHeaderController
{
/**
* @ngInject
*/
constructor
()
{
/**
* Tooltip message for current header column. Initialized from the scope (read-only).
...
...
src/app/frontend/replicationcontrollerdetail/updatereplicas_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -26,7 +26,6 @@ export default class UpdateReplicasDialogController {
* @param {!angular.$log} $log
* @param {!ui.router.$state} $state
* @param {!angular.$resource} $resource
* @param {!angular.$q} $q
* @param {string} namespace
* @param {string} replicationController
* @param {number} currentPods
...
...
@@ -34,7 +33,7 @@ export default class UpdateReplicasDialogController {
* @ngInject
*/
constructor
(
$mdDialog
,
$log
,
$state
,
$resource
,
$q
,
namespace
,
replicationController
,
currentPods
,
$mdDialog
,
$log
,
$state
,
$resource
,
namespace
,
replicationController
,
currentPods
,
desiredPods
)
{
/** @export {number} */
this
.
replicas
;
...
...
@@ -62,9 +61,6 @@ export default class UpdateReplicasDialogController {
/** @private {!angular.$resource} */
this
.
resource_
=
$resource
;
/** @private {!angular.$q} */
this
.
q_
=
$q
;
}
/**
...
...
src/app/frontend/replicationcontrollerlist/logsmenu_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -58,7 +58,7 @@ export default class LogsMenuController {
/**
* Opens menu with pods and link to logs.
* @param {!function(MouseEvent)} $mdOpenMenu
* @param {!function(
!
MouseEvent)} $mdOpenMenu
* @param {!MouseEvent} $event
* @export
*/
...
...
src/app/frontend/replicationcontrollerlist/replicationcontrollercardmenu_controller.js
浏览文件 @
9d4d6ce6
...
...
@@ -23,13 +23,12 @@ import {stateName} from 'replicationcontrollerdetail/replicationcontrollerdetail
export
default
class
ReplicationControllerCardMenuController
{
/**
* @param {!ui.router.$state} $state
* @param {!angular.$log} $log
* @param
* {!./../replicationcontrollerdetail/replicationcontroller_service.ReplicationControllerService}
* kdReplicationControllerService
* @ngInject
*/
constructor
(
$state
,
$log
,
kdReplicationControllerService
)
{
constructor
(
$state
,
kdReplicationControllerService
)
{
/**
* Initialized from the scope.
* @export {!backendApi.ReplicationController}
...
...
@@ -39,9 +38,6 @@ export default class ReplicationControllerCardMenuController {
/** @private {!ui.router.$state} */
this
.
state_
=
$state
;
/** @private {!angular.$log} */
this
.
log_
=
$log
;
/** @private
* {!./../replicationcontrollerdetail/replicationcontroller_service.ReplicationControllerService}
*/
...
...
@@ -49,7 +45,7 @@ export default class ReplicationControllerCardMenuController {
}
/**
* @param {!function(MouseEvent)} $mdOpenMenu
* @param {!function(
!
MouseEvent)} $mdOpenMenu
* @param {!MouseEvent} $event
* @export
*/
...
...
src/test/frontend/deploy/deploy_controller_test.js
浏览文件 @
9d4d6ce6
...
...
@@ -36,7 +36,7 @@ describe('Deploy controller', () => {
DeployFromSettingController
,
{},
{
namespaces
:
[],
protocols
:
[],
secrets
:
[],
deploy
:
()
=>
$q
.
defer
().
promise
});
ctrl
=
$controller
(
DeployController
,
{
namespaces
:
[],
protocols
:
[]
,
secrets
:
[]
},
DeployController
,
{
namespaces
:
[],
protocols
:
[]},
{
detail
:
settingsCtrl
,
deployForm
:
{
$valid
:
true
}});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录