refactoring: move moving stuff around

This commit is contained in:
Torkel Ödegaard
2015-10-30 15:04:27 +01:00
parent 6cf46b1635
commit 97de8c1cc2
13 changed files with 12 additions and 26 deletions

View File

@@ -9,7 +9,6 @@ define([
'angular-strap',
'angular-dragdrop',
'angular-ui',
'extend-jquery',
'bindonce',
'app/core/core',
],
@@ -73,7 +72,6 @@ function (angular, $, _, appLevelRequire) {
'app/services/all',
'app/features/all',
'app/controllers/all',
'app/components/partials',
];
app.boot = function() {

View File

@@ -16,6 +16,9 @@
///<amd-dependency path="./directives/value_select_dropdown" />
///<amd-dependency path="./routes/all" />
///<amd-dependency path="./jquery_extended" />
///<amd-dependency path="./partials" />
export * from './directives/array_join'
export * from './directives/give_focus'
export * from './filters/filters'

View File

@@ -1,7 +1,7 @@
define([
'angular',
'lodash',
'app/core/config',
'vendor/filesaver'
],
function (angular, _) {
'use strict';

View File

@@ -84,9 +84,9 @@ function (angular, _, require, config) {
module.directive('clipboardButton',function() {
return function(scope, elem) {
require(['ZeroClipboard'], function(ZeroClipboard) {
require(['vendor/zero_clipboard'], function(ZeroClipboard) {
ZeroClipboard.config({
swfPath: config.appSubUrl + '/public/vendor/ZeroClipboard.swf'
swfPath: config.appSubUrl + '/public/vendor/zero_clipboard.swf'
});
new ZeroClipboard(elem[0]);
});

View File

@@ -3,13 +3,11 @@ require.config({
baseUrl: 'public',
paths: {
'extend-jquery': 'app/components/extend-jquery',
lodash: 'app/components/lodash.extended',
'lodash-src': 'vendor/lodash',
lodash: 'app/core/lodash_extended',
text: 'vendor/requirejs-text/text',
moment: 'vendor/moment',
filesaver: 'vendor/filesaver',
ZeroClipboard: 'vendor/ZeroClipboard',
angular: 'vendor/angular/angular',
'angular-route': 'vendor/angular-route/angular-route',
'angular-sanitize': 'vendor/angular-sanitize/angular-sanitize',
@@ -21,10 +19,7 @@ require.config({
bindonce: 'vendor/angular-bindonce/bindonce',
crypto: 'vendor/crypto.min',
spectrum: 'vendor/spectrum',
'lodash-src': 'vendor/lodash',
bootstrap: 'vendor/bootstrap/bootstrap',
jquery: 'vendor/jquery/dist/jquery',
'jquery.flot': 'vendor/flot/jquery.flot',
@@ -42,6 +37,7 @@ require.config({
'bootstrap-tagsinput': 'vendor/tagsinput/bootstrap-tagsinput',
'aws-sdk': 'vendor/aws-sdk/dist/aws-sdk.min',
},
shim: {
spectrum: {
@@ -52,10 +48,6 @@ require.config({
exports: 'Crypto'
},
ZeroClipboard: {
exports: 'ZeroClipboard'
},
angular: {
deps: ['jquery'],
exports: 'angular'

View File

@@ -2,7 +2,7 @@ require.config({
baseUrl: 'http://localhost:9876/base/',
paths: {
lodash: 'app/components/lodash.extended',
lodash: 'app/core/lodash_extended',
'lodash-src': 'vendor/lodash',
moment: 'vendor/moment',
@@ -21,7 +21,6 @@ require.config({
bindonce: 'vendor/angular-bindonce/bindonce',
crypto: 'vendor/crypto.min',
spectrum: 'vendor/spectrum',
jquery: 'vendor/jquery/dist/jquery',
bootstrap: 'vendor/bootstrap/bootstrap',
@@ -40,7 +39,6 @@ require.config({
'jquery.flot.fillbelow': 'vendor/flot/jquery.flot.fillbelow',
modernizr: 'vendor/modernizr-2.6.1',
'aws-sdk': 'vendor/aws-sdk/dist/aws-sdk.min',
},
shim: {

View File

@@ -19,7 +19,7 @@
<!-- build:js [[.AppSubUrl]]/app/app.js -->
<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 -->
</head>