Skip to content

Commit

Permalink
Fixed tslint related issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Viliam Rockai committed Feb 19, 2015
1 parent f96c3ae commit 5a52808
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 14 deletions.
15 changes: 12 additions & 3 deletions .travis.build.plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

pushd $@
npm install && bower instal && gulp build
popd
status=0;

for plugin in $(find plugins/ -maxdepth 1 -mindepth 1);
do
pushd $plugin
(npm install && bower install && gulp build) || status=1;
popd
done;

if [ "$status" != 0 ]; then
exit 1;
fi
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ before_install:
- 'npm install -g bower gulp typescript'

script:
- 'for plugin in $(find plugins/ -maxdepth 1 -mindepth 1); do ./.travis.build.plugin.sh $plugin; done;'
- './.travis.build.plugin.sh'

# use this line in case of building only a sub-set of plugins
# - 'for plugin in alerts inventory metrics; do ./.travis.build.plugin.sh $plugin; done;'
4 changes: 2 additions & 2 deletions plugins/alerts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"bower": "1.3.12",
"event-stream": "3.1.7",
"gulp": "3.8.10",
"gulp": "3.8.11",
"gulp-angular-templatecache": "1.5.0",
"gulp-clean": "0.3.1",
"gulp-concat": "2.4.2",
Expand All @@ -14,7 +14,7 @@
"gulp-load-plugins": "0.8.0",
"gulp-notify": "2.1.0",
"gulp-typescript": "2.4.2",
"gulp-tslint": "1.4.2",
"gulp-tslint": "1.4.3",
"gulp-watch": "3.0.0",
"through2": "0.6.3",
"underscore.string": "2.4.0",
Expand Down
5 changes: 3 additions & 2 deletions plugins/inventory/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "hawkular-inventory",
"version": "0.1.0",
"private": true,
"devDependencies": {
"bower": "^1.3.12",
"event-stream": "^3.1.7",
"gulp": "^3.8.10",
"gulp": "3.8.11",
"gulp-angular-templatecache": "^1.5.0",
"gulp-clean": "^0.3.1",
"gulp-concat": "^2.4.2",
Expand All @@ -13,7 +14,7 @@
"gulp-load-plugins": "^0.8.0",
"gulp-notify": "^2.1.0",
"gulp-typescript": "^2.3.0",
"gulp-tslint": "1.4.2",
"gulp-tslint": "1.4.3",
"gulp-watch": "^3.0.0",
"through2": "^0.6.3",
"underscore.string": "^2.4.0",
Expand Down
8 changes: 4 additions & 4 deletions plugins/inventory/plugins/inventory/ts/inventory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ module Inventory {
});
});
}
}
};

$scope.queryMetrics = function() {
if(this.tenantId && this.resourceId) {
this.metrics = hkInventory.Metric.query({tenantId: this.tenantId, resourceId: this.resourceId});
}
}
};

$scope.showMetric = function(tenantId, resourceId, metricId) {
var _tenantId = tenantId || this.tenantId;
Expand All @@ -29,11 +29,11 @@ module Inventory {
$rootScope.metricData.resourceId = _resourceId;
$rootScope.metricData.metricId = _metricId;
}
}
};

$scope.closeChart = function() {
delete $rootScope.metricData;
}
};

}]);

Expand Down
4 changes: 2 additions & 2 deletions plugins/metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"bower": "1.3.12",
"event-stream": "3.2.1",
"gulp": "3.8.10",
"gulp": "3.8.11",
"gulp-angular-templatecache": "1.5.0",
"gulp-clean": "0.3.1",
"gulp-concat": "2.4.3",
Expand All @@ -16,7 +16,7 @@
"gulp-notify": "2.1.0",
"gulp-plumber": "0.6.6",
"gulp-size": "1.2.0",
"gulp-tslint": "1.4.2",
"gulp-tslint": "1.4.3",
"gulp-typescript": "2.4.2",
"gulp-watch": "3.0.0",
"through2": "^0.6.3",
Expand Down

0 comments on commit 5a52808

Please sign in to comment.