From ead8dc4f4681a5fc9952f030c8c3d9f92e167c7c Mon Sep 17 00:00:00 2001 From: or frenkel Date: Thu, 5 Feb 2015 23:21:41 +0200 Subject: [PATCH 1/9] Update angular-redactor.js My fix is to add a remove listener and before it's removed calling the destroy function. This will remove all tooltips from the body and release the redactor properly. --- angular-redactor.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/angular-redactor.js b/angular-redactor.js index e69b359..27c6fce 100644 --- a/angular-redactor.js +++ b/angular-redactor.js @@ -54,6 +54,10 @@ $timeout(function() { editor = $_element.redactor(options); ngModel.$render(); + element.on('remove',function(){ + element.off('remove'); + element.redactor('core.destroy'); + }); }); ngModel.$render = function() { From 6d9ae48892ae65bc0acb5b5e7769fab513d7d8cf Mon Sep 17 00:00:00 2001 From: "Making GitHub Delicious." Date: Thu, 7 May 2015 17:50:09 -0600 Subject: [PATCH 2/9] add waffle.io badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2f1a8dc..423e749 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Stories in Ready](https://badge.waffle.io/TylerGarlick/angular-redactor.png?label=ready&title=Ready)](https://waffle.io/TylerGarlick/angular-redactor) angular-redactor ================ From dde5944e38fc29502c0454ce49f61532e3906c8a Mon Sep 17 00:00:00 2001 From: bisubus Date: Mon, 15 Jun 2015 16:26:39 +0300 Subject: [PATCH 3/9] loosen jQuery version restriction --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 577f21b..4c2a699 100644 --- a/bower.json +++ b/bower.json @@ -24,7 +24,7 @@ "tests" ], "dependencies": { - "jquery": ">=2.0.0", + "jquery": "^2.0.0 || ^1.9.0", "angular": ">=1.2.0" }, "devDependencies": { From 5a967dc0be34479d99aef6bd112340020537c688 Mon Sep 17 00:00:00 2001 From: bisubus Date: Mon, 15 Jun 2015 16:26:39 +0300 Subject: [PATCH 4/9] redundant jqLite wrapper --- angular-redactor-9.x.js | 7 +++---- angular-redactor.js | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/angular-redactor-9.x.js b/angular-redactor-9.x.js index f73ffbc..fe6e0c3 100644 --- a/angular-redactor-9.x.js +++ b/angular-redactor-9.x.js @@ -35,8 +35,7 @@ }, additionalOptions = attrs.redactor ? scope.$eval(attrs.redactor) : {}, - editor, - $_element = angular.element(element); + editor; angular.extend(options, redactorOptions, additionalOptions); @@ -51,14 +50,14 @@ // put in timeout to avoid $digest collision. call render() to // set the initial value. $timeout(function() { - editor = $_element.redactor(options); + editor = element.redactor(options); ngModel.$render(); }); ngModel.$render = function() { if(angular.isDefined(editor)) { $timeout(function() { - $_element.redactor('set', ngModel.$viewValue || ''); + element.redactor('set', ngModel.$viewValue || ''); scope.redactorLoaded = true; }); } diff --git a/angular-redactor.js b/angular-redactor.js index 27c6fce..5a106ae 100644 --- a/angular-redactor.js +++ b/angular-redactor.js @@ -35,8 +35,7 @@ }, additionalOptions = attrs.redactor ? scope.$eval(attrs.redactor) : {}, - editor, - $_element = angular.element(element); + editor; angular.extend(options, redactorOptions, additionalOptions); @@ -52,7 +51,7 @@ // put in timeout to avoid $digest collision. call render() to // set the initial value. $timeout(function() { - editor = $_element.redactor(options); + editor = element.redactor(options); ngModel.$render(); element.on('remove',function(){ element.off('remove'); @@ -63,8 +62,8 @@ ngModel.$render = function() { if(angular.isDefined(editor)) { $timeout(function() { - $_element.redactor('code.set', ngModel.$viewValue || ''); - $_element.redactor('placeholder.toggle'); + element.redactor('code.set', ngModel.$viewValue || ''); + element.redactor('placeholder.toggle'); scope.redactorLoaded = true; }); } From ea08a7fe53c916a5485078129048509c175928a5 Mon Sep 17 00:00:00 2001 From: Oleg Sulyanov Date: Tue, 16 Feb 2016 19:29:10 +0700 Subject: [PATCH 5/9] Added Redactor II support --- README.md | 6 +++++ angular-redactor-2.js | 62 +++++++++++++++++++++++++++++++++++++++++++ bower.json | 2 +- demo/app.js | 2 +- demo/index.html | 7 ++--- demo/views/main.html | 4 +-- 6 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 angular-redactor-2.js diff --git a/README.md b/README.md index 423e749..871a52f 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Angular Redactor is an angular directive for the Redactor editor. http://impera Important Changes -------------- +There is an additional file (angular-redactor-2) for Redactor II. As of version 1.1.0, there is an additional file (angular-redactor-9.x) has been added to accommodate the the 9.x version of redactor, the angular-redactor.js will support the latest version of redactor. @@ -37,6 +38,11 @@ With Options ``` +With Plugins +```html + +``` + You can pass options directly to Redactor by specifying them as the value of the `redactor` attribute. Global Options diff --git a/angular-redactor-2.js b/angular-redactor-2.js new file mode 100644 index 0000000..5db78cb --- /dev/null +++ b/angular-redactor-2.js @@ -0,0 +1,62 @@ +(function() { + 'use strict'; + + /** + * usage: + * + * additional options: + * redactor: hash (pass in a redactor options hash) + * + */ + + var redactorOptions = {}; + + angular.module('angular-redactor', []) + .constant('redactorOptions', redactorOptions) + .directive('redactor', ['$timeout', function($timeout) { + return { + restrict: 'A', + require: 'ngModel', + link: function(scope, element, attrs, ngModel) { + + // Expose scope var with loaded state of Redactor + scope.redactorLoaded = false; + + var updateModel = function updateModel(value) { + // $timeout to avoid $digest collision + $timeout(function() { + scope.$apply(function() { + ngModel.$setViewValue(value); + }); + }); + }, + options = { + callbacks: { + change: updateModel + } + }, + additionalOptions = attrs.redactor ? + scope.$eval(attrs.redactor) : {}, + editor; + + angular.extend(options, redactorOptions, additionalOptions); + + // put in timeout to avoid $digest collision. call render() + // to set the initial value. + $timeout(function() { + editor = element.redactor(options); + ngModel.$render(); + }); + + ngModel.$render = function() { + if(angular.isDefined(editor)) { + $timeout(function() { + element.redactor('code.set', ngModel.$viewValue || ''); + scope.redactorLoaded = true; + }); + } + }; + } + }; + }]); +})(); \ No newline at end of file diff --git a/bower.json b/bower.json index 4c2a699..36ca378 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "angular-redactor", "main": "angular-redactor.js", - "version": "1.1.4", + "version": "1.1.5", "homepage": "https://github.com/TylerGarlick/angular-redactor", "authors": [ "Tyler Garlick " diff --git a/demo/app.js b/demo/app.js index 7194100..485de1a 100644 --- a/demo/app.js +++ b/demo/app.js @@ -17,5 +17,5 @@ angular.module('app') $scope.changeContent = function () { $scope.content = "

Some bogus content

" } - $scope.content = "

This is my fawesome content

"; + $scope.content = "

This is my awesome content

"; }]); \ No newline at end of file diff --git a/demo/index.html b/demo/index.html index de2af31..79ada0d 100644 --- a/demo/index.html +++ b/demo/index.html @@ -5,16 +5,17 @@ + + +
- - - + \ No newline at end of file diff --git a/demo/views/main.html b/demo/views/main.html index 147210a..97b79de 100644 --- a/demo/views/main.html +++ b/demo/views/main.html @@ -23,11 +23,11 @@

Demo

Air Option
- +
Markup 
-      <textarea ng-model="content" redactor="{air: true}" cols="30" rows="10"></textarea>
+      <textarea ng-model="content" redactor="{air: true, plugins: ['source']}" cols="30" rows="10"></textarea>
From ca455fc5db7404dac441be30d4850a7763dc7a0c Mon Sep 17 00:00:00 2001 From: "bruno.oliveira" Date: Wed, 14 Sep 2016 11:39:22 -0300 Subject: [PATCH 6/9] Add package.json for publish in npmjs.com --- package.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..1408ee1 --- /dev/null +++ b/package.json @@ -0,0 +1,29 @@ +{ + "name": "angular-redactor", + "version": "1.1.5", + "description": "Directive for redactor WYSIWYG editor", + "main": "angular-redactor.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/TylerGarlick/angular-redactor.git" + }, + "keywords": [ + "Redactor", + "WYSIWYG", + "Angular", + "Directives", + "Html5", + "Editor" + ], + "author": [ + "Tyler Garlick " + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/TylerGarlick/angular-redactor/issues" + }, + "homepage": "https://github.com/TylerGarlick/angular-redactor#readme" +} From 438f1b2fa4bafd9896c1098c5c6ef95a238ab83a Mon Sep 17 00:00:00 2001 From: "bruno.oliveira" Date: Wed, 14 Sep 2016 11:42:48 -0300 Subject: [PATCH 7/9] Update README.md for add npm installation --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 871a52f..4bca481 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Global Options ```js angular.module('app', ['angular-redactor']) .config(function(redactorOptions) { - redactorOptions.buttons = ['formatting', '|', 'bold', 'italic']; + redactorOptions.buttons = ['formatting', '|', 'bold', 'italic']; }); ``` @@ -63,3 +63,9 @@ Bower Installation ```js bower install angular-redactor ``` + +NPM Installation +-------------- +```js +npm install angular-redactor +``` From 0b67d8a25dd3e4c9f210f2dc8f8e1f9aec3bc237 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira <321.bruno@gmail.com> Date: Thu, 25 May 2017 12:03:55 -0300 Subject: [PATCH 8/9] update version package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1408ee1..3ab98b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-redactor", - "version": "1.1.5", + "version": "1.1.6", "description": "Directive for redactor WYSIWYG editor", "main": "angular-redactor.js", "scripts": { From ddd6f3357ece5bd077d39b3b9e3884d07b53daef Mon Sep 17 00:00:00 2001 From: Bruno Oliveira <321.bruno@gmail.com> Date: Thu, 25 May 2017 12:11:06 -0300 Subject: [PATCH 9/9] Release 1.1.7 Support for Redactor II and uploaded in npm repositories --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ab98b0..3f30e30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-redactor", - "version": "1.1.6", + "version": "1.1.7", "description": "Directive for redactor WYSIWYG editor", "main": "angular-redactor.js", "scripts": {