From 94415860b4773de413359c4679b57d3f7a266a6e Mon Sep 17 00:00:00 2001 From: Michael Shick Date: Tue, 29 Mar 2016 13:32:39 -0700 Subject: [PATCH 1/3] support new full size option from redactor --- app/components/redactor-rte.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/components/redactor-rte.js b/app/components/redactor-rte.js index 2f78c680..1942dddb 100644 --- a/app/components/redactor-rte.js +++ b/app/components/redactor-rte.js @@ -158,6 +158,9 @@ export default Ember.Component.extend({ case 'large': size = 1200; break; + case 'full': + size = 0; + break; } if (size) { From ae1491baac14e15673b01f8a7ddae2a1385757fb Mon Sep 17 00:00:00 2001 From: Michael Shick Date: Tue, 29 Mar 2016 13:56:59 -0700 Subject: [PATCH 2/3] proper test for size now that we have a 0 size --- app/components/redactor-rte.js | 4 ++-- bower.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/redactor-rte.js b/app/components/redactor-rte.js index 1942dddb..1de08050 100644 --- a/app/components/redactor-rte.js +++ b/app/components/redactor-rte.js @@ -146,7 +146,7 @@ export default Ember.Component.extend({ var self = this; this.get('whRedactor').$editor.on('imageCommand', 'figure', function (event, command) { - var size; + var size = null; switch (command) { case 'small': @@ -163,7 +163,7 @@ export default Ember.Component.extend({ break; } - if (size) { + if (size !== null) { var url = $(this).find('img').attr('data-resize-src'), resizeUrl = self.resizeImage(url, size); $(this).find('img').attr('src', resizeUrl); diff --git a/bower.json b/bower.json index 6287e1fe..80f8068e 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,7 @@ "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.2", "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2", "webhook-js": "*", - "webhook-redactor": "webhook/webhook-redactor", + "webhook-redactor": "mshick/webhook-redactor", "firebase": "2.0.x", "firebase-simple-login": "1.6.x", "embedly-jquery": "~3.1.1", From 2502fe1d850d8fd90a624f7976a566244ada637a Mon Sep 17 00:00:00 2001 From: Michael Shick Date: Tue, 29 Mar 2016 14:00:22 -0700 Subject: [PATCH 3/3] remove custom redactor --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 80f8068e..6287e1fe 100644 --- a/bower.json +++ b/bower.json @@ -12,7 +12,7 @@ "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.2", "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2", "webhook-js": "*", - "webhook-redactor": "mshick/webhook-redactor", + "webhook-redactor": "webhook/webhook-redactor", "firebase": "2.0.x", "firebase-simple-login": "1.6.x", "embedly-jquery": "~3.1.1",