From aac0c34db053cad7bc7bfda776dda918e3fdf90e Mon Sep 17 00:00:00 2001 From: liltof Date: Mon, 8 Aug 2016 13:36:55 +0200 Subject: [PATCH 1/2] Added toolbarFloat attribute (defaults to true) Defaults to true for backward compatibility Can be used like this
--- javascripts/angular-editor.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/javascripts/angular-editor.js b/javascripts/angular-editor.js index dc4f1a0..c7def77 100644 --- a/javascripts/angular-editor.js +++ b/javascripts/angular-editor.js @@ -15,10 +15,12 @@ element.append("
"); var toolbar = scope.$eval(attrs.toolbar) || TOOLBAR_DEFAULT; + var toolbarFloat = scope.$eval(attrs.toolbarFloat) || true; scope.simditor = new Simditor({ textarea: element.children()[0], pasteImage: true, toolbar: toolbar, + toolbarFloat : toolbarFloat, defaultImage: 'assets/images/image.png', upload: location.search === '?upload' ? { url: '/upload' From cbaff0ac1b96199995482de766f09ac7f63b9261 Mon Sep 17 00:00:00 2001 From: liltof Date: Mon, 8 Aug 2016 13:51:37 +0200 Subject: [PATCH 2/2] Error in default value for toolbarFloat the default value was not correctly read --- javascripts/angular-editor.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/javascripts/angular-editor.js b/javascripts/angular-editor.js index c7def77..409a123 100644 --- a/javascripts/angular-editor.js +++ b/javascripts/angular-editor.js @@ -15,12 +15,13 @@ element.append("
"); var toolbar = scope.$eval(attrs.toolbar) || TOOLBAR_DEFAULT; - var toolbarFloat = scope.$eval(attrs.toolbarFloat) || true; + var toolbarFloat = scope.$eval(attrs.toolbarFloat); + var valToolBarFload = toolbarFloat === false ? false : true; scope.simditor = new Simditor({ textarea: element.children()[0], pasteImage: true, toolbar: toolbar, - toolbarFloat : toolbarFloat, + toolbarFloat : valToolBarFload, defaultImage: 'assets/images/image.png', upload: location.search === '?upload' ? { url: '/upload'