Merge tothandras/buildbot:modularize_plugins (PR #1160)

buildbot · Jun 11, 2014 · 94924fd · 94924fd
2 parents c0b57e6 + 35e636e
commit 94924fd
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 32 deletions.
diff --git a/...pts/directives/codefield.directive.coffee → ...ter/src/module/codefield.directive.coffee b/...pts/directives/codefield.directive.coffee → ...ter/src/module/codefield.directive.coffee
@@ -2,11 +2,11 @@
 # Ace is already modular, and is better kept this way (e.g. language support is in modules)
 window.define ["codeparameter/scripts/ace/ace"], ->
     # add ui-ace to the list of needed modules
-    angular.module('app').requires.push("ui.ace")
+    angular.module('buildbot.common').requires.push("ui.ace")
 
     # defines custom field directives which only have templates
     _.each [ 'codefield' ], (fieldtype) ->
-        angular.module('app').directive fieldtype, ->
+        angular.module('buildbot.common').directive fieldtype, ->
             replace: false
             restrict: 'E'
             scope: false

diff --git a/...odule/views/directives/codefield.tpl.jade → ...deparameter/src/module/codefield.tpl.jade b/...odule/views/directives/codefield.tpl.jade → ...deparameter/src/module/codefield.tpl.jade
diff --git a/...deparameter/src/module/styles/styles.less → www/codeparameter/src/styles/styles.less b/...deparameter/src/module/styles/styles.less → www/codeparameter/src/styles/styles.less
diff --git a/...cripts/directives/d3demo.directive.coffee → ...src/module/d3demo/d3demo.directive.coffee b/...cripts/directives/d3demo.directive.coffee → ...src/module/d3demo/d3demo.directive.coffee
@@ -1,4 +1,4 @@
-angular.module("app").directive "d3demo", ["sample_plugin_config", (config) ->
+angular.module("buildbot.sample").directive "d3demo", ["sample_plugin_config", (config) ->
   restrict: "E"
   scope:
     val: "="

diff --git a/www/sample_plugin/src/module/demo.module.coffee b/www/sample_plugin/src/module/demo.module.coffee
@@ -0,0 +1,37 @@
+name = 'buildbot.sample'
+dependencies = [
+    'ui.router'
+    'buildbot.common'
+]
+
+# Register new module
+m = angular.module name, dependencies
+angular.module('app').requires.push(name)
+
+m.config ['$stateProvider',
+    ($stateProvider) ->
+
+        # Name of the state
+        name = 'demo'
+
+        # Configuration
+        cfg =
+            tabid: name
+            tabhash: "##{name}"
+            caption: 'Demo'
+
+        # Register new state
+        state =
+            templateUrl: "sample_plugin/views/#{name}.html"
+            name: name
+            url: '/demo'
+            data: cfg
+
+        $stateProvider.state(state)
+]
+
+m.controller 'demoController',
+  ['$log', '$scope', 'buildbotService', "sample_plugin_config"
+      ($log, $scope, buildbotService, config) ->
+          $scope.config = config
+  ]
diff --git a/...ple_plugin/src/module/views/demo.tpl.jade → www/sample_plugin/src/module/demo.tpl.jade b/...ple_plugin/src/module/views/demo.tpl.jade → www/sample_plugin/src/module/demo.tpl.jade
diff --git a/www/sample_plugin/src/module/scripts/controllers/demo.controller.coffee b/www/sample_plugin/src/module/scripts/controllers/demo.controller.coffee
diff --git a/www/sample_plugin/src/module/scripts/route.config.coffee b/www/sample_plugin/src/module/scripts/route.config.coffee
diff --git a/...mple_plugin/src/module/styles/styles.less → www/sample_plugin/src/styles/styles.less b/...mple_plugin/src/module/styles/styles.less → www/sample_plugin/src/styles/styles.less
diff --git a/www/src/app/app.run.coffee b/www/src/app/app.run.coffee
@@ -33,7 +33,7 @@ for plugin, cfg of config.plugins
 
     plugins_modules.push("#{plugin}/scripts/main")
     plugins_paths[plugin] = config.url + "#{plugin}"
-    angular.module('app').constant("#{plugin}_config", cfg)
+    angular.module('buildbot.common').constant("#{plugin}_config", cfg)
 
 # make the config global variable accessible as a DI module
 # so that it can be mocked in tests