Merge branch 'Zeald-support-buttonLabels'

linkesch · Sep 25, 2014 · 5b8a8cb · 5b8a8cb
2 parents 4c88d29 + 58e34f6
commit 5b8a8cb
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 6 deletions.
diff --git a/dist/js/addons/medium-editor-insert-embeds.js b/dist/js/addons/medium-editor-insert-embeds.js
@@ -36,6 +36,10 @@
       if (buttonLabels == 'fontawesome' || typeof buttonLabels === 'object' && !!(buttonLabels.fontawesome)) {
         label = '<i class="fa fa-code"></i>';
       }
+	  if (typeof buttonLabels === 'object' && buttonLabels.embed) {
+		  label = buttonLabels.embed;
+	  }
+
       return '<button data-addon="embeds" data-action="add" class="medium-editor-action mediumInsert-action">' + label + '</button>';
     },
 

diff --git a/dist/js/addons/medium-editor-insert-embeds.min.js b/dist/js/addons/medium-editor-insert-embeds.min.js
diff --git a/dist/js/addons/medium-editor-insert-images.js b/dist/js/addons/medium-editor-insert-images.js
@@ -125,6 +125,11 @@
       if (buttonLabels == 'fontawesome' || typeof buttonLabels === 'object' && !!(buttonLabels.fontawesome)) {
         label = '<i class="fa fa-picture-o"></i>';
       }
+
+	  if (typeof buttonLabels === 'object' && buttonLabels.img) {
+		  label = buttonLabels.img;
+	  }
+
       return '<button data-addon="images" data-action="add" class="medium-editor-action mediumInsert-action">'+label+'</button>';
     },