Kick off new hawtio-ui plugin to hold UI directives, move hawtio-conf…

…irm-dialog there
hawtio · May 1, 2013 · ce7e2b5 · ce7e2b5
1 parent 2ab1caa
commit ce7e2b5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/hawtio-web/src/main/webapp/app/activemq/js/activemqPlugin.ts b/hawtio-web/src/main/webapp/app/activemq/js/activemqPlugin.ts
@@ -2,7 +2,7 @@ module ActiveMQ {
   var pluginName = 'activemq';
   var jmxDomain = 'org.apache.activemq';
 
-  angular.module(pluginName, ['bootstrap', 'ngResource', 'ui.bootstrap.dialog', 'hawtioCore', 'camel']).config(($routeProvider) => {
+  angular.module(pluginName, ['bootstrap', 'ngResource', 'ui.bootstrap.dialog', 'hawtioCore', 'camel', 'hawtio-ui']).config(($routeProvider) => {
             $routeProvider.
                     when('/activemq/browseQueue', {templateUrl: 'app/activemq/html/browseQueue.html'}).
                     when('/activemq/subscribers', {templateUrl: 'app/activemq/html/subscribers.html'}).

diff --git a/hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts b/hawtio-web/src/main/webapp/app/camel/js/camelPlugin.ts
@@ -10,7 +10,7 @@ module Camel {
   var contextToolBar = "app/camel/html/attributeToolBarContext.html";
 
 
-  angular.module(pluginName, ['bootstrap', 'ui.bootstrap', 'ui.bootstrap.dialog', 'ngResource', 'hawtioCore']).
+  angular.module(pluginName, ['bootstrap', 'ui.bootstrap', 'ui.bootstrap.dialog', 'ngResource', 'hawtioCore', 'hawtio-ui']).
           config(($routeProvider) => {
             $routeProvider.
                     when('/camel/browseEndpoint', {templateUrl: 'app/camel/html/browseEndpoint.html'}).

diff --git a/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts b/hawtio-web/src/main/webapp/app/core/js/corePlugin.ts
@@ -314,9 +314,6 @@ angular.module('hawtioCore', ['bootstrap', 'ngResource', 'ui', 'ui.bootstrap.dia
           };
           return editableProperty;
         }]).
-        directive('hawtioConfirmDialog', function() {
-          return new Core.ConfirmDialog();
-        }).
         directive('gridStyle', function($window) {
           return new Core.GridStyle($window);
         });

diff --git a/hawtio-web/src/main/webapp/app/forms/js/formPlugin.ts b/hawtio-web/src/main/webapp/app/forms/js/formPlugin.ts
@@ -2,7 +2,7 @@ module Forms {
 
   export var pluginName = 'hawtio-forms';
 
-  angular.module(Forms.pluginName, ['bootstrap', 'ngResource', 'hawtioCore', 'datatable', 'ui.bootstrap', 'ui.bootstrap.dialog']).
+  angular.module(Forms.pluginName, ['bootstrap', 'ngResource', 'hawtioCore', 'datatable', 'ui.bootstrap', 'ui.bootstrap.dialog', 'hawtio-ui']).
           config(($routeProvider) => {
             $routeProvider.
                     when('/forms/test', {templateUrl: 'app/forms/html/test.html'}).

diff --git a/...n/webapp/app/core/html/confirmDialog.html → ...ain/webapp/app/ui/html/confirmDialog.html b/...n/webapp/app/core/html/confirmDialog.html → ...ain/webapp/app/ui/html/confirmDialog.html
diff --git a/...app/app/core/js/confirmDialogDirective.ts → ...ebapp/app/ui/js/confirmDialogDirective.ts b/...app/app/core/js/confirmDialogDirective.ts → ...ebapp/app/ui/js/confirmDialogDirective.ts
@@ -1,10 +1,10 @@
-module Core {
+module UI {
 
   export class ConfirmDialog {
     public restrict = 'A';
     public replace = true;
     public transclude = true;
-    public templateUrl = 'app/core/html/confirmDialog.html';
+    public templateUrl = 'app/ui/html/confirmDialog.html';
 
     public scope = {
       show: '=hawtioConfirmDialog',

diff --git a/hawtio-web/src/main/webapp/app/ui/js/uiPlugin.ts b/hawtio-web/src/main/webapp/app/ui/js/uiPlugin.ts
@@ -0,0 +1,14 @@
+module UI {
+
+  export var pluginName = 'hawtio-ui';
+
+  angular.module(UI.pluginName, ['bootstrap', 'ngResource', 'hawtioCore', 'ui', 'ui.bootstrap']).
+      directive('hawtioConfirmDialog', function() {
+        return new UI.ConfirmDialog();
+      });
+
+
+
+  hawtioPluginLoader.addModule(pluginName);
+
+}