Skip to content

Commit

Permalink
Remove all define in src
Browse files Browse the repository at this point in the history
  • Loading branch information
artf committed May 31, 2017
1 parent 7633552 commit fed2423
Show file tree
Hide file tree
Showing 255 changed files with 17,243 additions and 18,107 deletions.
11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
"babel-preset-es2015": "^6.24.1",
"chai": "^3.5.0",
"documentation": "^4.0.0-beta2",
"expect": "^1.20.2",
"istanbul": "^0.4.2",
"jsdom": "^11.0.0",
"mocha": "^3.1.2",
"node-sass": "^3.4.2",
"requirejs": "^2.3.2",
Expand All @@ -55,14 +57,19 @@
"template",
"editor"
],
"babel": {
"presets": [
"es2015"
]
},
"scripts": {
"lint": "eslint src",
"build": "WEBPACK_ENV=prod && npm run v:patch && webpack && npm run build:css",
"build": "WEBPACK_ENV=prod && npm run test && npm run v:patch && webpack && npm run build:css",
"build:css": "node-sass styles/scss/main.scss dist/css/grapesjs.min.css",
"build:fonts": "./node_modules/.bin/grunt build:fonts",
"v:patch": "npm version --no-git-tag-version patch",
"start": "WEBPACK_ENV=dev webpack-dev-server --progress --colors & npm run build:css -- -w",
"test": "mocha --compilers js:babel-core/register --require ./test/helper.js --recursive ./test/*.js",
"test": "NODE_PATH=./src mocha --compilers js:babel-core/register --require test/helper.js --recursive test/main.js",
"test:dev": "npm test -- -R min -w"
}
}
26 changes: 12 additions & 14 deletions src/asset_manager/config/config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
define(function () {
return {
// Default assets
assets: [],
module.exports = {
// Default assets
assets: [],

// Style prefix
stylePrefix: 'am-',
// Style prefix
stylePrefix: 'am-',

// Url where uploads will be send, set false to disable upload
upload: 'http://localhost/assets/upload',
// Url where uploads will be send, set false to disable upload
upload: 'http://localhost/assets/upload',

// Text on upload input
uploadText: 'Drop files here or click to upload',
// Text on upload input
uploadText: 'Drop files here or click to upload',

// Label for the add button
addBtnText: 'Add image',
};
});
// Label for the add button
addBtnText: 'Add image',
};
Loading

0 comments on commit fed2423

Please sign in to comment.