yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

Moved some multiple-entry shimmings to web_modules, because Bower specs about main are still not finished, and webpack doesn't support multiple entry-aliases neither yet.

Browse source 
Also making custom css/overriding them becomes easier.
This commit is contained in:
Gunther Brunner 2014-06-27 19:34:17 +09:00
parent 41ce702b90
commit 0aefed70c8
7 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bower.json
View file

@ -40,12 +40,14 @@
"angular-elastic": "~2.3.4",
"quick-ng-repeat": "~0.0.1",
"angular-vs-repeat": "~1.0.0-rc2",
"checklist-model": "~0.1.3"
"checklist-model": "~0.1.3",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.3.1"
},
"private": true,
"resolutions": {
"angular": "~1.3.0-beta.13",
"angular-sanitize": "~1.3.0-beta.13",
"angular-touch": "~1.3.0-beta.13"
"angular-touch": "~1.3.0-beta.13",
"angular-hotkeys": "~1.3.1"
}
}

5
res/app/app.js
View file

@ -3,14 +3,15 @@ require('angular-route')
require('angular-touch')
require('angular-gettext')
require('ng-file-upload-shim5')
require('ng-file-upload-main')
require('ng-file-upload')
require('angular-hotkeys')
angular.module('app', [
'ngRoute',
'ngTouch',
'gettext',
'angularFileUpload',
'cfp.hotkeys',
require('./layout').name,
require('./device-list').name,
require('./control-panes').name,

3
res/app/components/stf/common-ui/notifications/index.js
View file

@ -1,7 +1,6 @@
require('angular-animate')
//require('angular-growl-v2/build/angular-growl.min.css')
require('./growl.css')
require('angular-growl-v2/build/angular-growl.js')
require('angular-growl')
module.exports = angular.module('stf/common-ui/notifications', [
'ngAnimate',

3
res/web_modules/angular-growl/index.js vendored Normal file
View file

@ -0,0 +1,3 @@
require('angular-growl-v2/build/angular-growl.js')
// Using custom CSS
//require('angular-growl-v2/build/angular-growl.min.css')

2
res/web_modules/angular-hotkeys/index.js vendored Normal file
View file

@ -0,0 +1,2 @@
require('angular-hotkeys/build/hotkeys.css')
require('angular-hotkeys/build/hotkeys.js')

2
res/web_modules/ng-file-upload/index.js Normal file
View file

@ -0,0 +1,2 @@
require('ng-file-upload/angular-file-upload-html5-shim')
require('ng-file-upload/angular-file-upload')

6
webpack.config.js
View file

@ -16,18 +16,14 @@ module.exports = {
modulesDirectories: [
pathutil.resource('bower_components')
, pathutil.resource('app/components')
, 'web_modules'
, pathutil.resource('web_modules')
, './node_modules'
]
, alias: {
'angular-bootstrap': 'angular-bootstrap/ui-bootstrap-tpls'
, 'angular-growl': 'angular-growl-v2/build/angular-growl.js'
, 'angular-growl-css': 'angular-growl-v2/build/angular-growl.min.css'
, 'localforage': 'localforage/dist/localforage.js'
, 'socket.io': 'socket.io-client/socket.io.js'
, 'oboe': 'oboe/dist/oboe-browser'
, 'ng-file-upload-shim5': 'ng-file-upload/angular-file-upload-html5-shim'
, 'ng-file-upload-main': 'ng-file-upload/angular-file-upload'
, 'bluebird': 'bluebird/js/browser/bluebird'
}
}