Skip to content

N
nexpie-grafana-theme
Commit 97de8c1c by Torkel Ödegaard
Options

refactoring: move moving stuff around

parent 6cf46b16
Showing with 12 additions and 26 deletions
public/app/app.js
...@@ -9,7 +9,6 @@ define([ ...@@ -9,7 +9,6 @@ define([
'angular-strap', 'angular-strap',
'angular-dragdrop', 'angular-dragdrop',
'angular-ui', 'angular-ui',
'extend-jquery',
'bindonce', 'bindonce',
'app/core/core', 'app/core/core',
], ],
...@@ -73,7 +72,6 @@ function (angular, $, _, appLevelRequire) { ...@@ -73,7 +72,6 @@ function (angular, $, _, appLevelRequire) {
'app/services/all', 'app/services/all',
'app/features/all', 'app/features/all',
'app/controllers/all', 'app/controllers/all',
'app/components/partials',
]; ];
app.boot = function() { app.boot = function() {
......
public/app/core/core.ts
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
///<amd-dependency path="./directives/value_select_dropdown" /> ///<amd-dependency path="./directives/value_select_dropdown" />
///<amd-dependency path="./routes/all" /> ///<amd-dependency path="./routes/all" />
///<amd-dependency path="./jquery_extended" />
///<amd-dependency path="./partials" />
export * from './directives/array_join' export * from './directives/array_join'
export * from './directives/give_focus' export * from './directives/give_focus'
export * from './filters/filters' export * from './filters/filters'
......
public/app/features/dashboard/dashboardNavCtrl.js
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'app/core/config', 'vendor/filesaver'
], ],
function (angular, _) { function (angular, _) {
'use strict'; 'use strict';
......
public/app/features/dashboard/shareModalCtrl.js
...@@ -84,9 +84,9 @@ function (angular, _, require, config) { ...@@ -84,9 +84,9 @@ function (angular, _, require, config) {
module.directive('clipboardButton',function() { module.directive('clipboardButton',function() {
return function(scope, elem) { return function(scope, elem) {
require(['ZeroClipboard'], function(ZeroClipboard) { require(['vendor/zero_clipboard'], function(ZeroClipboard) {
ZeroClipboard.config({ ZeroClipboard.config({
swfPath: config.appSubUrl + '/public/vendor/ZeroClipboard.swf' swfPath: config.appSubUrl + '/public/vendor/zero_clipboard.swf'
}); });
new ZeroClipboard(elem[0]); new ZeroClipboard(elem[0]);
}); });
......
public/app/components/require.config.js → public/app/require_config.js
...@@ -3,13 +3,11 @@ require.config({ ...@@ -3,13 +3,11 @@ require.config({
baseUrl: 'public', baseUrl: 'public',
paths: { paths: {
'extend-jquery': 'app/components/extend-jquery', 'lodash-src': 'vendor/lodash',
lodash: 'app/components/lodash.extended', lodash: 'app/core/lodash_extended',
text: 'vendor/requirejs-text/text', text: 'vendor/requirejs-text/text',
moment: 'vendor/moment', moment: 'vendor/moment',
filesaver: 'vendor/filesaver',
ZeroClipboard: 'vendor/ZeroClipboard',
angular: 'vendor/angular/angular', angular: 'vendor/angular/angular',
'angular-route': 'vendor/angular-route/angular-route', 'angular-route': 'vendor/angular-route/angular-route',
'angular-sanitize': 'vendor/angular-sanitize/angular-sanitize', 'angular-sanitize': 'vendor/angular-sanitize/angular-sanitize',
...@@ -21,10 +19,7 @@ require.config({ ...@@ -21,10 +19,7 @@ require.config({
bindonce: 'vendor/angular-bindonce/bindonce', bindonce: 'vendor/angular-bindonce/bindonce',
crypto: 'vendor/crypto.min', crypto: 'vendor/crypto.min',
spectrum: 'vendor/spectrum', spectrum: 'vendor/spectrum',
'lodash-src': 'vendor/lodash',
bootstrap: 'vendor/bootstrap/bootstrap', bootstrap: 'vendor/bootstrap/bootstrap',
jquery: 'vendor/jquery/dist/jquery', jquery: 'vendor/jquery/dist/jquery',
'jquery.flot': 'vendor/flot/jquery.flot', 'jquery.flot': 'vendor/flot/jquery.flot',
...@@ -42,6 +37,7 @@ require.config({ ...@@ -42,6 +37,7 @@ require.config({
'bootstrap-tagsinput': 'vendor/tagsinput/bootstrap-tagsinput', 'bootstrap-tagsinput': 'vendor/tagsinput/bootstrap-tagsinput',
'aws-sdk': 'vendor/aws-sdk/dist/aws-sdk.min', 'aws-sdk': 'vendor/aws-sdk/dist/aws-sdk.min',
}, },
shim: { shim: {
spectrum: { spectrum: {
...@@ -52,10 +48,6 @@ require.config({ ...@@ -52,10 +48,6 @@ require.config({
exports: 'Crypto' exports: 'Crypto'
}, },
ZeroClipboard: {
exports: 'ZeroClipboard'
},
angular: { angular: {
deps: ['jquery'], deps: ['jquery'],
exports: 'angular' exports: 'angular'
......
public/test/test-main.js
...@@ -2,7 +2,7 @@ require.config({ ...@@ -2,7 +2,7 @@ require.config({
baseUrl: 'http://localhost:9876/base/', baseUrl: 'http://localhost:9876/base/',
paths: { paths: {
lodash: 'app/components/lodash.extended', lodash: 'app/core/lodash_extended',
'lodash-src': 'vendor/lodash', 'lodash-src': 'vendor/lodash',
moment: 'vendor/moment', moment: 'vendor/moment',
...@@ -21,7 +21,6 @@ require.config({ ...@@ -21,7 +21,6 @@ require.config({
bindonce: 'vendor/angular-bindonce/bindonce', bindonce: 'vendor/angular-bindonce/bindonce',
crypto: 'vendor/crypto.min', crypto: 'vendor/crypto.min',
spectrum: 'vendor/spectrum', spectrum: 'vendor/spectrum',
jquery: 'vendor/jquery/dist/jquery', jquery: 'vendor/jquery/dist/jquery',
bootstrap: 'vendor/bootstrap/bootstrap', bootstrap: 'vendor/bootstrap/bootstrap',
...@@ -40,7 +39,6 @@ require.config({ ...@@ -40,7 +39,6 @@ require.config({
'jquery.flot.fillbelow': 'vendor/flot/jquery.flot.fillbelow', 'jquery.flot.fillbelow': 'vendor/flot/jquery.flot.fillbelow',
modernizr: 'vendor/modernizr-2.6.1', modernizr: 'vendor/modernizr-2.6.1',
'aws-sdk': 'vendor/aws-sdk/dist/aws-sdk.min',
}, },
shim: { shim: {
......
public/views/index.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<!-- build:js [[.AppSubUrl]]/app/app.js --> <!-- build:js [[.AppSubUrl]]/app/app.js -->
<script src="[[.AppSubUrl]]/public/vendor/requirejs/require.js"></script> <script src="[[.AppSubUrl]]/public/vendor/requirejs/require.js"></script>
<script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script> <script src="[[.AppSubUrl]]/public/app/require_config.js"></script>
<!-- endbuild --> <!-- endbuild -->
</head> </head>
......
tasks/options/requirejs.js
...@@ -6,7 +6,7 @@ module.exports = function(config,grunt) { ...@@ -6,7 +6,7 @@ module.exports = function(config,grunt) {
var options = { var options = {
appDir: '<%= genDir %>', appDir: '<%= genDir %>',
dir: '<%= tempDir %>', dir: '<%= tempDir %>',
mainConfigFile: '<%= genDir %>/app/components/require.config.js', mainConfigFile: '<%= genDir %>/app/require_config.js',
baseUrl: './', baseUrl: './',
waitSeconds: 0, waitSeconds: 0,
...@@ -41,16 +41,12 @@ module.exports = function(config,grunt) { ...@@ -41,16 +41,12 @@ module.exports = function(config,grunt) {
// main/common module // main/common module
name: 'app/app', name: 'app/app',
include: [ include: [
'kbn',
'text', 'text',
'jquery', 'jquery',
'angular',
'settings',
'bootstrap', 'bootstrap',
'modernizr', 'modernizr',
'timepicker', 'timepicker',
'datepicker', 'datepicker',
'lodash',
'jquery.flot', 'jquery.flot',
'angular-strap', 'angular-strap',
'angular-dragdrop', 'angular-dragdrop',
...@@ -58,7 +54,6 @@ module.exports = function(config,grunt) { ...@@ -58,7 +54,6 @@ module.exports = function(config,grunt) {
'app/services/all', 'app/services/all',
'app/features/all', 'app/features/all',
'app/controllers/all', 'app/controllers/all',
'app/components/partials',
// bundle the datasources // bundle the datasources
'app/plugins/datasource/grafana/datasource', 'app/plugins/datasource/grafana/datasource',
'app/plugins/datasource/graphite/datasource', 'app/plugins/datasource/graphite/datasource',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment