From ae91a8f9943af2bfc95dccf465c4f22f425c05d9 Mon Sep 17 00:00:00 2001 From: Stefan Neculai Date: Wed, 13 May 2015 20:12:49 +0300 Subject: [PATCH] Update to version 1.2.7. --- CHANGELOG.md | 4 ++++ README.md | 22 ++++++++++------------ package.js | 6 +++--- versions.json | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1265d8..54b3ef1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.2.7 - 2015-05-13 + +- [upgrade] Bump version dependency on froala-editor to 1.2.7 + ## 1.2.5_1 - 2015-01-25 - [upgrade] Bump version dependency on froala-editor to 1.2.5_2 diff --git a/README.md b/README.md index 7d2234d..88f0494 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ## Froala-Reactive -Froala-Reactive provides a template-based, reactive wrapper around the [Froala Editor](https://editor.froala.com/) WYSIWYG HTML editor, designed to play nicely with [Meteor Framework](https://www.meteor.com/) client-side templates. +Froala-Reactive provides a template-based, reactive wrapper around the [Froala WYSIWYG HTML Editor](https://froala.com/wysiwyg-editor/pricing), designed to play nicely with [Meteor Framework](https://www.meteor.com/) client-side templates. -Note that Froala Editor requires a [license for commercial use](https://editor.froala.com/pricing). +Note that Froala Editor requires a [license for commercial use](https://froala.com/wysiwyg-editor/pricing). #### Installation @@ -61,9 +61,9 @@ However, Froala-Reactive *will* reactively update the displayed `_value` HTML im #### Options and Events -You can provide callbacks for any of the Froala-Editor [events](https://editor.froala.com/events) by specifying `_on` arguments in the `{{> froalaReactive}}` inclusion tag with name of template helper functions that must return a function with the expected Froala-Editor event function signature. +You can provide callbacks for any of the Froala-Editor [events](https://froala.com/wysiwyg-editor/docs/events) by specifying `_on` arguments in the `{{> froalaReactive}}` inclusion tag with name of template helper functions that must return a function with the expected Froala-Editor event function signature. -For example, to set up a callback for the [afterUploadPastedImage](https://editor.froala.com/events#afterUploadPastedImage) event: +For example, to set up a callback for the [afterUploadPastedImage](https://froala.com/wysiwyg-editor/docs/events#afterUploadPastedImage) event: ```html {{> froalaReactive ... _onafterUploadPastedImage=imagePasted ...}} @@ -77,12 +77,12 @@ Template.myTemplate.helpers({ // Do something }; } -}); +}); ``` Note that the event name used in the `_on` argument name must be exactly the same as used in the Froala Editor `on('editable.', function ....)` callback declaration. The Froala-Reactive code simply extracts the string from the inclusion tag argument, and appends it to the `editable.` string when setting up the underlying Froala-Editor plugin callback -Similarly, you can pass any of the Froala-Editor [options](https://editor.froala.com/options) to the underlying Froala-Editor plugin object, by simply declaring them as arguments to the `froalaReactive` inclusion tag. Also, if any of these option argument values are set to values on your template's data context, or from return vaues from template helpers, Froala-Reactive will call the Froala Editor `option` setter method to change them if any of them change values once your template has been rendered. +Similarly, you can pass any of the Froala-Editor [options](https://froala.com/wysiwyg-editor/docs/options) to the underlying Froala-Editor plugin object, by simply declaring them as arguments to the `froalaReactive` inclusion tag. Also, if any of these option argument values are set to values on your template's data context, or from return vaues from template helpers, Froala-Reactive will call the Froala Editor `option` setter method to change them if any of them change values once your template has been rendered. ```html {{> froalaReactive ... language=getLanguage ...}} @@ -96,11 +96,11 @@ Template.myTemplate.helpers({ }) ``` -Note that some option values cannot be changed after initialisation (e.g. [inlineMode](https://editor.froala.com/options#inlineMode)) ... please refer to the Meteor-Editor documentation. +Note that some option values cannot be changed after initialisation (e.g. [inlineMode](https://froala.com/wysiwyg-editor/docsoptions#inlineMode)) ... please refer to the Meteor-Editor documentation. #### Methods -You can invoke any of the Froala Editor [methods](https://editor.froala.com/methods) directly on the `editor` object in your Froala Editor event callback functions. See above for an example of calling `editor.getHTML()`. +You can invoke any of the Froala Editor [methods](https://froala.com/wysiwyg-editor/docs/methods) directly on the `editor` object in your Froala Editor event callback functions. See above for an example of calling `editor.getHTML()`. #### jQuery 'editable' instance method clash @@ -130,7 +130,5 @@ This package is based on the implementation of the [x-editable-reactive-template This package is released under the MIT License (see LICENSE). -You may use the editor for non-commercial websites for free under the [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](http://creativecommons.org/licenses/by-nc-nd/4.0/). - -Froala Editor has [4 different licenses](http://editor.froala.com/download/) for commercial use. -For details please see [License Agreement](http://editor.froala.com/license). +Froala Editor has [4 different licenses](https://froala.com/wysiwyg-editor/pricing) for commercial use. +For details please see [License Agreement](https://froala.com/wysiwyg-editor/terms). diff --git a/package.js b/package.js index 3c47233..8ce31d5 100644 --- a/package.js +++ b/package.js @@ -1,7 +1,7 @@ Package.describe({ name: 'froala:editor-reactive', - summary: 'A Meteor reactive template wrapper around Froala Editor', - version: '1.2.6', + summary: 'A Meteor reactive template wrapper around Froala WYSIWYG HTML Rich Text Editor.', + version: '1.2.7', git: 'https://github.com/froala/froala-reactive.git' }); @@ -10,7 +10,7 @@ Package.onUse(function(api) { // Declare package dependencies api.use([ - 'froala:editor@1.2.6', + 'froala:editor@1.2.7', 'templating', 'underscore' ], 'client'); diff --git a/versions.json b/versions.json index 4d4ac02..8c930fa 100644 --- a/versions.json +++ b/versions.json @@ -22,7 +22,7 @@ ], [ "froala:editor", - "1.2.6" + "1.2.7" ], [ "geojson-utils",