diff --git a/app/assets/javascripts/admin/products/products.js.coffee b/app/assets/javascripts/admin/products/products.js.coffee index 402db8b7ff..cbca5abfcc 100644 --- a/app/assets/javascripts/admin/products/products.js.coffee +++ b/app/assets/javascripts/admin/products/products.js.coffee @@ -1 +1 @@ -angular.module("admin.products", ["textAngular", "admin.utils"]) \ No newline at end of file +angular.module("admin.products", ["textAngular", "admin.utils"]) diff --git a/app/serializers/api/product_serializer.rb b/app/serializers/api/product_serializer.rb index 9f2726cdd7..dfb82cedf6 100644 --- a/app/serializers/api/product_serializer.rb +++ b/app/serializers/api/product_serializer.rb @@ -55,7 +55,7 @@ class Api::CachedProductSerializer < ActiveModel::Serializer #return a sanitized html description def description_html - d = sanitize(object.description, tags: "p, b, strong, em, i") + d = sanitize(object.description, tags: "p, b, strong, em, i, a, u", attributes: "href, target") d.to_s.html_safe end diff --git a/app/views/spree/admin/products/_form.html.haml b/app/views/spree/admin/products/_form.html.haml index 4e97d209cd..b41b858c42 100644 --- a/app/views/spree/admin/products/_form.html.haml +++ b/app/views/spree/admin/products/_form.html.haml @@ -12,7 +12,7 @@ = f.field_container :description do = f.label :description, t(:description) - %text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"} + %text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', "textangular-links-target-blank" => true, 'ta-toolbar' => "[['bold','italics','underline','clear'],['insertLink']]"} = sanitize(@product.description) = f.error_message_on :description diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index a018e3784d..7d126c192c 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -76,7 +76,7 @@ = f.field_container :description do = f.label :product_description, t(:product_description) %br/ - %text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"} + %text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', "textangular-links-target-blank" => true, 'ta-toolbar' => "[['bold','italics','underline','clear'],['insertLink']]"} = f.error_message_on :description .four.columns.omega{ style: "text-align: center" } %fieldset.no-border-bottom{ id: "image" }