Skip to content

Commit

Permalink
Move js for CRUD view to ps_crud
Browse files Browse the repository at this point in the history
  • Loading branch information
uralbash committed Mar 15, 2016
1 parent 891ce3c commit 32525a5
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 126 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"postcss-loader": "^0.8.0",
"sass-loader": "^3.1.2",
"sizzle": "^2.3.0",
"string-replace-loader": "^1.0.0",
"style-loader": "^0.13.0",
"url-loader": "^0.5.7",
"webpack": "^1.12.13"
Expand Down
2 changes: 1 addition & 1 deletion pyramid_sacrud/static/css/__main.css

Large diffs are not rendered by default.

Binary file modified pyramid_sacrud/static/fonts/MaterialIcons-Regular.eot
Binary file not shown.
Binary file modified pyramid_sacrud/static/fonts/MaterialIcons-Regular.ttf
Binary file not shown.
Binary file modified pyramid_sacrud/static/fonts/MaterialIcons-Regular.woff
Binary file not shown.
Binary file modified pyramid_sacrud/static/fonts/MaterialIcons-Regular.woff2
Binary file not shown.
32 changes: 16 additions & 16 deletions pyramid_sacrud/static/js/assets/__main.js

Large diffs are not rendered by default.

103 changes: 0 additions & 103 deletions pyramid_sacrud/static/js/src/listView.js

This file was deleted.

1 change: 0 additions & 1 deletion pyramid_sacrud/static/js/src/main.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
import '../../css/main.scss';
import './materialize';
import './listView';
5 changes: 0 additions & 5 deletions pyramid_sacrud/static/js/src/settings.js

This file was deleted.

8 changes: 8 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ config = {
}
},
module: {
preLoaders: [{
test: /jquery\/src\/selector-sizzle\.js$/,
loader: 'string-replace',
query: {
search: '../external/sizzle/dist/sizzle',
replace: 'sizzle'
}
}],
loaders: [
{
test: /\.jsx?$/,
Expand Down

0 comments on commit 32525a5

Please sign in to comment.