v1.3.3

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015"],
+  "plugins": ["transform-runtime", "add-module-exports"]
+}

.eslintrc

@@ -1,23 +1,25 @@
 {
   "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
   "env": {
-    "node": 1,
-    "browser": 1,
-    "es6": 1
+    "es6": true,
+    "browser": true,
+    "node": true
   },
   "globals": {
-    "angular": 1
+    "__DEV__": true,
+    "__TEST__": true,
+    "__RELEASE__": true,
+    "__BASE_PATH__": true
   },
   "rules": {
-    "quotes": [2, "single", "avoid-escape"],
-    "eqeqeq": 0,
-    "no-use-before-define": 0,
-    "no-shadow": 0,
-    "brace-style": [2, "stroustrup"],
-    "eol-last": 0,
-    "no-nested-ternary": 1,
-    "padded-blocks": [1, "never"],
-    "space-before-function-paren": [1, "never"],
-    "space-before-blocks": [1, "always"]
+    "indent": [ 2, 2 ],
+    "quotes": [ 2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
+    "linebreak-style": [ 2, "unix" ],
+    "semi": [ 2, "always" ]
   }
 }

app/component/component.i18n.js

@@ -2,4 +2,4 @@ export default $translateProvider => {
   'ngInject';
   $translateProvider.translations('en', require('./lang/en.json'));
   $translateProvider.translations('zh-tw', require('./lang/zh-tw.json'));
-}
+};

app/component/component.service.js

@@ -4,43 +4,43 @@ class CellularService {
   constructor(...injects) {
     CellularService.$inject.forEach((item, index) => this[item] = injects[index]);
     switch(config.get.type) {
-      case 'collection':
-        this.data = [];
-        break;
-      case 'model':
-        this.data = {};
-        break;
-      default:
-        this.data = [];
+    case 'collection':
+      this.data = [];
+      break;
+    case 'model':
+      this.data = {};
+      break;
+    default:
+      this.data = [];
     }
   }
 
   _transform(data) {
     switch(config.get.type) {
-      case 'collection':
-        return this._.map(data, (item, index) => {
-          return {
-            title: (config.get.titlePrefix || 'tab') + index,
-            content: item,
-            formOptions: {},
-            fields: config.fields
-          };
-        });
-      case 'model':
+    case 'collection':
+      return this._.map(data, (item, index) => {
         return {
-          content: data,
+          title: (config.get.titlePrefix || 'tab') + index,
+          content: item,
           formOptions: {},
           fields: config.fields
         };
-      default:
-        return this._.map(data, (item, index) => {
-          return {
-            title: (config.get.titlePrefix || 'tab') + index,
-            content: item,
-            formOptions: {},
-            fields: config.fields
-          };
-        });
+      });
+    case 'model':
+      return {
+        content: data,
+        formOptions: {},
+        fields: config.fields
+      };
+    default:
+      return this._.map(data, (item, index) => {
+        return {
+          title: (config.get.titlePrefix || 'tab') + index,
+          content: item,
+          formOptions: {},
+          fields: config.fields
+        };
+      });
     }
   }
 

app/component/form/container.component.js

@@ -0,0 +1,6 @@
+const CellularFormContainerComponent = {
+  template: `<sanji-cellular-form data="vm.data" on-submit="vm.onSave(data)"></sanji-cellular-form>`,
+  controller: 'CellularFormContainerController',
+  controllerAs: 'vm'
+};
+export default CellularFormContainerComponent;

app/component/form/component-container.controller.js → app/component/form/container.controller.js

@@ -6,21 +6,14 @@ class CellularFormContainerController {
 
     this.sanjiWindowMgr = this.sanjiWindowService.get(WINDOW_ID);
     this.data = this.cellularService.data;
-
-    this.activate();
-
-    this.$scope.$on('sj:window:refresh', this.onRefresh.bind(this))
-  }
-
-  activate() {
-    this.sanjiWindowMgr.promise = this.cellularService.get().then(() => {
-      this.data = this.cellularService.data;
-    });
+    this.$scope.$on('sj:window:refresh', this.onRefresh.bind(this));
   }
 
   onRefresh(event, args) {
     if (args.id === WINDOW_ID) {
-      this.activate();
+      this.sanjiWindowMgr.promise = this.cellularService.get().then(() => {
+        this.data = this.cellularService.data;
+      });
     }
   }
 

app/component/form/form.component.js

@@ -0,0 +1,10 @@
+const CellularFormComponent = {
+  bindings: {
+    tabs: '<data',
+    submitCallback: '&onSubmit'
+  },
+  templateUrl: 'sanji-cellular-form.tpl.html',
+  controller: 'CellularFormController',
+  controllerAs: 'vm'
+};
+export default CellularFormComponent;

app/component/form/index.js

@@ -1,15 +1,15 @@
 import angular from 'angular';
 import sjCore from 'sanji-core-ui';
 
-import './component.tpl.html';
-import CellularFormContainerController from './component-container.controller';
-import CellularFormController from './component.controller';
-import CellularFormContainerDirective from './component-container.directive';
-import CellularFormDirective from './component.directive';
+import './form.tpl.html';
+import CellularFormContainerController from './container.controller';
+import CellularFormController from './form.controller';
+import CellularFormContainerComponent from './container.component';
+import CellularFormComponent from './form.component';
 
 let app = angular.module('sanji.cellular.form', [sjCore]);
 app.controller('CellularFormContainerController', CellularFormContainerController);
 app.controller('CellularFormController', CellularFormController);
-app.directive('sanjiCellularFormContainer', CellularFormContainerDirective.directiveFactory);
-app.directive('sanjiCellularForm', CellularFormDirective.directiveFactory);
-export default app = app.name
+app.component('sanjiCellularFormContainer', CellularFormContainerComponent);
+app.component('sanjiCellularForm', CellularFormComponent);
+export default app = app.name;

app/component/index.js

@@ -5,7 +5,7 @@ import sjCellularForm from './form';
 
 import i18nConfig from './component.i18n';
 import CellularService from './component.service';
-import CellularWindowDirective from './component-window.directive';
+import CellularWindowComponent from './window.component';
 
 let app = angular.module('sanji.cellular', [
   sjCore,
@@ -14,5 +14,5 @@ let app = angular.module('sanji.cellular', [
 ]);
 app.config(i18nConfig);
 app.service('cellularService', CellularService);
-app.directive('sanjiCellularWindow', CellularWindowDirective.directiveFactory);
-export default app = app.name
+app.component('sanjiCellularWindow', CellularWindowComponent);
+export default app = app.name;

app/component/info/cellular-signal.component.js

@@ -0,0 +1,10 @@
+// reference from http://codepen.io/shorepound/details/GpXVwW/
+const CellularSignalComponent = {
+  bindings: {
+    signal: '<'
+  },
+  templateUrl: 'sanji-cellular-signal.tpl.html',
+  controller: 'CellularSignalController',
+  controllerAs: 'vm'
+};
+export default CellularSignalComponent;

app/component/info/cellular-signal.tpl.html

@@ -11,7 +11,7 @@
       </div>
       <div class="circle">
         <div class="circle-text">
-          {{vm.signal}}</br>
+          <span ng-bind="vm.signal"></span></br>
           <span class="circle-text-under">dBm</span>
         </div>
       </div>

app/component/info/container.component.js

@@ -0,0 +1,6 @@
+const CellularInfoContainerComponent = {
+  template: `<sanji-cellular-info data="vm.data"></sanji-cellular-info>`,
+  controller: 'CellularInfoContainerController',
+  controllerAs: 'vm'
+};
+export default CellularInfoContainerComponent;