diff --git a/src/component/form/form.tpl.html b/src/component/form/form.tpl.html index a121e7f..50b55f4 100644 --- a/src/component/form/form.tpl.html +++ b/src/component/form/form.tpl.html @@ -25,6 +25,10 @@

+

+ + {{': ' + $ctrl.carrier.current.carrier}} +

diff --git a/src/component/info/container.component.js b/src/component/info/container.component.js index 47798fd..5391305 100644 --- a/src/component/info/container.component.js +++ b/src/component/info/container.component.js @@ -2,8 +2,6 @@ import CellularInfoContainerController from './container.controller'; const CellularInfoContainerComponent = { template: ``, controller: CellularInfoContainerController }; diff --git a/src/component/info/container.controller.js b/src/component/info/container.controller.js index dc1d9aa..d5f4256 100644 --- a/src/component/info/container.controller.js +++ b/src/component/info/container.controller.js @@ -24,10 +24,6 @@ class CellularInfoContainerController { }; } - onFetchCarrier(event) { - return this.getCellularCarrier(event.id); - } - onRefresh(event, args) { if (args.id === WINDOW_ID) { this.sanjiWindowMgr.promise = this.getCellulars({ force: true }); diff --git a/src/component/info/info.component.js b/src/component/info/info.component.js index 404c361..178dc6d 100644 --- a/src/component/info/info.component.js +++ b/src/component/info/info.component.js @@ -3,8 +3,6 @@ import CellularInfoController from './info.controller'; const CellularInfoComponent = { bindings: { tabs: ' (this[item] = injects[index])); } - - $onInit() { - this.currentCarrier = {}; - this.onFetchCarrier({ - $event: { - id: (this.tabIndex || 0) + 1 - } - }).then(carrier => { - this.currentCarrier = carrier.current; - }); - } } CellularInfoController.$inject = $inject; export default CellularInfoController; diff --git a/src/component/info/info.tpl.html b/src/component/info/info.tpl.html index 171d8f1..2d417fb 100644 --- a/src/component/info/info.tpl.html +++ b/src/component/info/info.tpl.html @@ -33,10 +33,6 @@

- -

- -

diff --git a/src/component/lang/en.json b/src/component/lang/en.json index 24b9562..ccecd66 100644 --- a/src/component/lang/en.json +++ b/src/component/lang/en.json @@ -47,5 +47,6 @@ "CELLULAR_FORM_SWITCH_CARRIER": "Switch Carrier", "CELLULAR_FORM_CARRIER": "Carrier", "CELLULAR_FORM_APPLY": "Apply", - "CELLULAR_FORM_SWITCH_CARRIER_MSG": "This operation will take several minutes and cellular module may not be available during operation, please ensure stable power supply." + "CELLULAR_FORM_SWITCH_CARRIER_MSG": "This operation will take several minutes and cellular module may not be available during operation, please ensure stable power supply.", + "CELLULAR_FORM_CURRENT_CARRIER": "Current Carrier" } diff --git a/src/component/lang/zh-tw.json b/src/component/lang/zh-tw.json index e3bc842..6cb061c 100644 --- a/src/component/lang/zh-tw.json +++ b/src/component/lang/zh-tw.json @@ -45,5 +45,6 @@ "CELLULAR_FORM_SWITCH_CARRIER": "切換電信商", "CELLULAR_FORM_CARRIER": "電信商", "CELLULAR_FORM_APPLY": "套用", - "CELLULAR_FORM_SWITCH_CARRIER_MSG": "這個動作需要數分鐘,過程中模組可能無法被正常存取,請保持電源的穩定供應." + "CELLULAR_FORM_SWITCH_CARRIER_MSG": "這個動作需要數分鐘,過程中模組可能無法被正常存取,請保持電源的穩定供應.", + "CELLULAR_FORM_CURRENT_CARRIER": "目前的電信商" }