Skip to content

Commit

Permalink
Move to the froala organization
Browse files Browse the repository at this point in the history
  • Loading branch information
Panman82 committed Mar 11, 2016
1 parent 2eb55c6 commit 3955e2e
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 15 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Bring the [Froala WYSIWYG Editor](https://www.froala.com/wysiwyg-editor)
into an ember-cli project with this addon. Besides importing the required
Froala Editor files, the _main_ part of this addon is the `{{froala-editor}}`
component. Checkout the [documentation Website](http://panman8201.github.io/ember-froala-editor/)
component. Checkout the [documentation Website](http://froala.github.io/ember-froala-editor/)
for installation, configuration, and usage details.


Expand All @@ -21,7 +21,7 @@ ember install ember-froala-editor

## Configuration

Take a look at the [configuration documentation page](http://panman8201.github.io/ember-froala-editor/#addon/configuration)
Take a look at the [configuration documentation page](http://froala.github.io/ember-froala-editor/#addon/configuration)
for details on the exact configuration options. But basically you add
`'ember-froala-editor':{}` within your `ember-cli-build.js` file and adjust
the available configuration options. Ex:
Expand All @@ -42,7 +42,7 @@ the available configuration options. Ex:

## Usage

Take a look at the [documentation Website](http://panman8201.github.io/ember-froala-editor/)
Take a look at the [documentation Website](http://froala.github.io/ember-froala-editor/)
for full usage details. But basically this addon comes with a few Ember
Components and Helpers to use within your project templates.

Expand Down Expand Up @@ -85,7 +85,7 @@ _Notes to self_ really...
1. `npm version x.y.z` - Updates the version in `package.json` and tags in git
2. `git push origin master` - Pushes any changes up to Github
3. `git push origin --tags` - Pushes the new version tag to Github
4. Update the new tag on the [Github Releases page](https://github.com/Panman8201/ember-froala-editor/releases)
4. Update the new tag on the [Github Releases page](https://github.com/froala/ember-froala-editor/releases)
5. `npm run deploy` - Deploys the docs to `gh-pages` using [ember-cli-github-pages](https://github.com/poetic/ember-cli-github-pages#how-can-i-create-an-automated-deploy-script)
6. `git checkout master` - Need to switch back to `master` after deploying the docs..
7. `npm publish` - Release the new version to the world!
Expand Down
31 changes: 26 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "ember-froala-editor",
"version": "1.0.0-alpha.2",
"description": "An ember-cli addon that properly wraps the Froala WYSIWYG Editor for use in Ember.js",
"homepage": "http://panman8201.github.io/ember-froala-editor/",
"bugs": "https://github.com/Panman8201/ember-froala-editor/issues",
"homepage": "http://froala.github.io/ember-froala-editor/",
"bugs": "https://github.com/froala/ember-froala-editor/issues",
"directories": {
"doc": "doc",
"test": "tests"
Expand All @@ -14,11 +14,32 @@
"test": "ember try:testall",
"deploy": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\"; git push; git checkout -"
},
"repository": "Panman8201/ember-froala-editor",
"repository": "froala/ember-froala-editor",
"engines": {
"node": ">= 0.10.0"
},
"author": "Ryan Panning <panman82@gmail.com>",
"contributors": [
{
"name": "Stefan Neculai",
"email": "stefan@froala.com"
},
{
"name": "Maulik Bengali",
"email": "maulik@ajackus.com"
},
{
"name": "Jignesh Chudasma",
"email": "jignesh@ajackus.com"
},
{
"name": "Mark Campbell",
"email": "mark@shopredberry.com"
},
{
"name": "Ryan Panning",
"email": "froala@gmail.com"
}
],
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
Expand Down Expand Up @@ -63,6 +84,6 @@
},
"ember-addon": {
"configPath": "tests/dummy/config",
"demoURL": "http://panman8201.github.io/ember-froala-editor/"
"demoURL": "http://froala.github.io/ember-froala-editor/"
}
}
5 changes: 1 addition & 4 deletions tests/dummy/app/templates/addon/installation.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@

<p>
This addon will also add a couple other dependencies to your project.
The <code><a href="https://github.com/froala/wysiwyg-editor" target="_blank">froala-wysiwyg-editor</a></code> will be added to your <code>bower.json</code> dependencies,
and <code><a href="https://github.com/martndemus/ember-cli-font-awesome" target="_blank">ember-cli-font-awesome</a></code> will be added to your <code>package.json</code> dependencies
(to satisfy the <a href="https://www.froala.com/wysiwyg-editor/docs#backend" target="_blank">Font Awesome requirement</a>).
And at this point jQuery is required for Ember, so there is no need to add a dependency for that.
The <code><a href="https://github.com/froala/wysiwyg-editor" target="_blank">froala-wysiwyg-editor</a></code> will be added to your <code>bower.json</code> dependencies, and <code><a href="https://github.com/martndemus/ember-cli-font-awesome" target="_blank">ember-cli-font-awesome</a></code> will be added to your <code>package.json</code> dependencies (to satisfy the <a href="https://www.froala.com/wysiwyg-editor/docs#backend" target="_blank">Font Awesome requirement</a>). And at this point jQuery is required for Ember, so there is no need to add a dependency for that.
</p>


Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<p class="navbar-text navbar-right hidden-xs">
{{addonVersion}}
<a href="https://github.com/Panman8201/ember-froala-editor" target="_blank" class="navbar-link">
<a href="https://github.com/froala/ember-froala-editor" target="_blank" class="navbar-link">
<i class="fa fa-github-square"></i>
</a>
<a href="https://www.froala.com/wysiwyg-editor/" target="_blank" class="navbar-link">
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


<p class="lead">
Bring the <a href="https://www.froala.com/wysiwyg-editor" target="_blank">Froala WYSIWYG Editor</a> into an ember-cli project with this addon. Besides importing the required Froala Editor files, the <em>main</em> part of this addon is the <code>&#123;&#123;froala-editor&#125;&#125;</code> component. Checkout the <a href="https://github.com/Panman8201/ember-froala-editor" target="_blank">Github page</a> to take a look at the code and to <a href="https://github.com/Panman8201/ember-froala-editor/issues" target="_blank">submit issues</a>.
Bring the <a href="https://www.froala.com/wysiwyg-editor" target="_blank">Froala WYSIWYG Editor</a> into an ember-cli project with this addon. Besides importing the required Froala Editor files, the <em>main</em> part of this addon is the <code>&#123;&#123;froala-editor&#125;&#125;</code> component. Checkout the <a href="https://github.com/froala/ember-froala-editor" target="_blank">Github page</a> to take a look at the code and to <a href="https://github.com/froala/ember-froala-editor/issues" target="_blank">submit issues</a>.
</p>


Expand Down

0 comments on commit 3955e2e

Please sign in to comment.