Merge pull request #65 from patou/insert-link

Insert Link option in summernotes.
patou · Apr 12, 2018 · 7f76252 · 7f76252
2 parents 2da2e81 + 38cb313
commit 7f76252
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/liste-envies-war/src/main/webapp/js/controllers/listCtrl.js b/liste-envies-war/src/main/webapp/js/controllers/listCtrl.js
@@ -17,7 +17,8 @@ function ListCtrl(wishService, appUserService, wishListService, $routeParams, $l
         placeholder: "Ajouter une description",
         toolbar: [
             ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']],
-            ['para', ['ul', 'ol', 'paragraph']]
+            ['para', ['ul', 'ol', 'paragraph']],
+            ['insert', ['link', 'picture']]
         ],
         popover: {
             image: [
@@ -30,7 +31,8 @@ function ListCtrl(wishService, appUserService, wishListService, $routeParams, $l
             ],
             air: [
                 ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']],
-                ['para', ['ul', 'ol', 'paragraph']]
+                ['para', ['ul', 'ol', 'paragraph']],
+                ['insert', ['link', 'picture']]
             ]
         },
         height: 200

diff --git a/liste-envies-war/src/main/webapp/js/directive/WishListSettings.js b/liste-envies-war/src/main/webapp/js/directive/WishListSettings.js
@@ -23,7 +23,8 @@ function WishListSettings(WishListTypePicture) {
         placeholder: "Ajouter une description",
         toolbar: [
             ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']],
-            ['para', ['ul', 'ol', 'paragraph']]
+            ['para', ['ul', 'ol', 'paragraph']],
+            ['insert', ['link', 'picture']]
         ],
         popover: {
             image: [
@@ -36,7 +37,8 @@ function WishListSettings(WishListTypePicture) {
             ],
             air: [
                 ['style', ['bold', 'italic', 'underline', 'clear', 'color', 'fontsize']],
-                ['para', ['ul', 'ol', 'paragraph']]
+                ['para', ['ul', 'ol', 'paragraph']],
+                ['insert', ['link', 'picture']]
             ]
         },
         height: 100