diff --git a/build/tslint.json b/build/tslint.json index 69800f58b..b5318e628 100644 --- a/build/tslint.json +++ b/build/tslint.json @@ -10,7 +10,6 @@ "no-consecutive-blank-lines": true, "no-construct": true, "no-debugger": true, - "no-duplicate-key": true, "triple-equals": [true, "allow-null-check"], "variable-name": [false, "allow-leading-underscore"], "no-empty": true, @@ -21,7 +20,6 @@ "no-bitwise": false, "no-string-literal": false, "no-trailing-whitespace": false, - "no-unreachable": false, "no-unused-expression": true, "no-use-before-declare": false, "no-var-requires": false, @@ -47,10 +45,6 @@ "catchClause", "indexSignature" ], - "use-strict": [false, - "check-module", - "check-function" - ], "whitespace": [false, "check-branch", "check-decl", diff --git a/package.json b/package.json index e2778da42..94eedda69 100644 --- a/package.json +++ b/package.json @@ -10,17 +10,17 @@ "devDependencies": { "chai": "3.2.0", "concurrently": "^2.1.0", - "grunt": "0.4.5", - "grunt-contrib-clean": "0.6.0", - "grunt-contrib-copy": "git+https://github.com/ErjanGavalji/grunt-contrib-copy.git#1c976a133210be4ce8c96313f5daf14833f7f8f9", + "grunt": "1.0.1", + "grunt-contrib-clean": "1.0.0", + "grunt-contrib-copy": "git+https://github.com/NativeScript/grunt-contrib-copy.git#master", "grunt-env": "0.4.4", - "grunt-exec": "0.4.6", - "grunt-mkdir": "0.1.2", + "grunt-exec": "1.0.1", + "grunt-mkdir": "1.0.0", "grunt-multi-dest": "1.0.0", - "grunt-shell": "1.1.2", - "grunt-simple-mocha": "0.4.0", + "grunt-shell": "2.1.0", + "grunt-simple-mocha": "0.4.1", "grunt-ts": "5.3.2", - "grunt-tslint": "3.0.3", + "grunt-tslint": "4.0.0", "grunt-typedoc": "0.2.4", "grunt-untar": "0.0.1", "http-server": "^0.9.0", @@ -29,7 +29,7 @@ "nativescript-typedoc-theme": "0.0.7", "shelljs": "^0.7.0", "time-grunt": "1.3.0", - "tslint": "^3.15.1", + "tslint": "^4.4.2", "typedoc": "0.4.5", "typescript": "~2.0.10" }, diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts index df401071f..f84322fe1 100644 --- a/tns-core-modules/ui/tab-view/tab-view.ios.ts +++ b/tns-core-modules/ui/tab-view/tab-view.ios.ts @@ -499,7 +499,7 @@ export class TabViewStyler implements style.Styler { var tabBar = v.ios.tabBar; let currentFont; - if (tabBar.items.count > 0) { + if (tabBar.items && tabBar.items.count > 0) { let currentAttrs = tabBar.items[0].titleTextAttributesForState(UIControlState.Normal); if (currentAttrs) { currentFont = currentAttrs.objectForKey(NSFontAttributeName); @@ -595,4 +595,4 @@ export class TabViewStyler implements style.Styler { } } -TabViewStyler.registerHandlers(); \ No newline at end of file +TabViewStyler.registerHandlers();