Skip to content

Commit

Permalink
Update README
Browse files Browse the repository at this point in the history
  • Loading branch information
artf committed Nov 6, 2017
1 parent a67cd1f commit 769246e
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
50 changes: 25 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Newsletter Demo - http://grapesjs.com/demo-newsletter-editor.html

* [Features](#features)
* [Download](#download)
* [Development](#development)
* [Usage](#usage)
* [Development](#development)
* [Documentation](#documentation)
* [API](#api)
* [Testing](#testing)
Expand Down Expand Up @@ -90,30 +90,6 @@ For the development purpose you should follow instructions below.



## Development

GrapesJS uses [Webpack](https://github.com/webpack/webpack) as a module bundler and [Babel](https://github.com/babel/babel) as a compiler.

Clone the repository and install all the necessary dependencies

```sh
$ git clone https://github.com/artf/grapesjs.git
$ cd grapesjs
$ npm i
```

Start the dev server

```sh
$ npm start
```

Once the development server is started you should be able to reach the demo page (eg. `http://localhost:8080`)





## Usage

```html
Expand Down Expand Up @@ -153,6 +129,30 @@ For more practical example I suggest to look up the code inside this demo: http:



## Development

GrapesJS uses [Webpack](https://github.com/webpack/webpack) as a module bundler and [Babel](https://github.com/babel/babel) as a compiler.

Clone the repository and install all the necessary dependencies

```sh
$ git clone https://github.com/artf/grapesjs.git
$ cd grapesjs
$ npm i
```

Start the dev server

```sh
$ npm start
```

Once the development server is started you should be able to reach the demo page (eg. `http://localhost:8080`)





## Documentation

Check the getting started guide here: [wiki]
Expand Down
4 changes: 2 additions & 2 deletions dist/grapes.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Free and Open Source Web Builder Framework",
"version": "0.12.22",
"version": "0.12.23",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",
Expand Down
6 changes: 3 additions & 3 deletions src/style_manager/view/PropertyView.js
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ module.exports = Backbone.View.extend({
*/
getComputedValue() {
const target = this.propTarget;
const computed = target.computed;
const computedDef = target.computedDefault;
const avoid = this.config.avoidComputed;
const computed = target.computed || {};
const computedDef = target.computedDefault || {};
const avoid = this.config.avoidComputed || [];
const property = this.model.get('property');
const notToSkip = avoid.indexOf(property) < 0;
const value = computed[property];
Expand Down

0 comments on commit 769246e

Please sign in to comment.