Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #14 from hawkular/bower-fixed-packages
Browse files Browse the repository at this point in the history
Bower fixed number versioning except let hawkular-ui-components float with patch changes so we will always get the latest *published* UI changes without updating the bower.json.
  • Loading branch information
mtho11 committed Feb 3, 2015
2 parents 79a4dca + c1e006e commit d6941b7
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 150 deletions.
20 changes: 8 additions & 12 deletions ui/console/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hawkular-console",
"version": "0.1.1",
"version": "0.1.3",
"private": true,
"keywords": [
"hawtio hawkular console"
Expand All @@ -12,18 +12,14 @@
"plugins"
],
"dependencies": {
"hawtio-core": "~2.0.0",
"hawtio-core-navigation": "~2.0.0",
"hawtio-utilities": "~2.0.0",
"hawkular-ui-components": "~0.1.6"
"hawtio-core": "2.0.9",
"hawtio-core-navigation": "2.0.17",
"hawtio-utilities": "2.0.16",
"hawkular-ui-components": "~0.1.8"
},
"devDependencies": {
"bootstrap": "~3.3.1",
"patternfly": "~1.1.2",
"hawtio-core-dts": "~2.0.0",
"angular-mocks": "~1.3.7"
},
"resolutions": {
"angular": "1.3.11"
"bootstrap": "3.3.2",
"patternfly": "1.1.3",
"hawtio-core-dts": "2.0.9"
}
}
3 changes: 0 additions & 3 deletions ui/console/defs.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@
* limitations under the License.
*/
/// <reference path="d.ts/includes.d.ts"/>
/// <reference path="d.ts/example/ts/exampleGlobals.d.ts"/>
/// <reference path="d.ts/example/ts/examplePlugin.d.ts"/>
/// <reference path="d.ts/example/ts/page1.d.ts"/>
36 changes: 0 additions & 36 deletions ui/console/dist/hawkular-console.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,3 @@
* limitations under the License.
*/
/// <reference path="../libs/hawtio-utilities/defs.d.ts"/>

/// <reference path="../../includes.ts"/>
var Example;
(function (Example) {
Example.pluginName = "hawtio-assembly";
Example.log = Logger.get(Example.pluginName);
Example.templatePath = "plugins/example/html";
})(Example || (Example = {}));

/// <reference path="../../includes.ts"/>
/// <reference path="exampleGlobals.ts"/>
var Example;
(function (Example) {
Example._module = angular.module(Example.pluginName, []);
var tab = undefined;
Example._module.config(['$locationProvider', '$routeProvider', 'HawtioNavBuilderProvider', function ($locationProvider, $routeProvider, builder) {
tab = builder.create().id(Example.pluginName).title(function () { return "Example"; }).href(function () { return "/example"; }).subPath("Page 1", "page1", builder.join(Example.templatePath, 'page1.html')).build();
builder.configureRouting($routeProvider, tab);
$locationProvider.html5Mode(true);
}]);
Example._module.run(['HawtioNav', function (HawtioNav) {
HawtioNav.add(tab);
Example.log.debug("loaded");
}]);
hawtioPluginLoader.addModule(Example.pluginName);
})(Example || (Example = {}));

/// <reference path="examplePlugin.ts"/>
var Example;
(function (Example) {
Example.Page1Controller = Example._module.controller("Example.Page1Controller", ['$scope', function ($scope) {
$scope.target = "World!";
}]);
})(Example || (Example = {}));

angular.module("hawkular-console-templates", []).run(["$templateCache", function($templateCache) {$templateCache.put("plugins/example/html/page1.html","<div class=\"row\">\n <div class=\"col-md-12\" ng-controller=\"Example.Page1Controller\">\n <h1>Page 1</h1>\n <p>Hello {{target}}</p>\n </div>\n</div>\n");}]); hawtioPluginLoader.addModule("hawkular-console-templates");
6 changes: 0 additions & 6 deletions ui/console/plugins/example/html/page1.html

This file was deleted.

26 changes: 0 additions & 26 deletions ui/console/plugins/example/ts/exampleGlobals.ts

This file was deleted.

43 changes: 0 additions & 43 deletions ui/console/plugins/example/ts/examplePlugin.ts

This file was deleted.

24 changes: 0 additions & 24 deletions ui/console/plugins/example/ts/page1.ts

This file was deleted.

0 comments on commit d6941b7

Please sign in to comment.