Skip to content

Commit

Permalink
Fixed issue #42
Browse files Browse the repository at this point in the history
  • Loading branch information
Waxolunist committed Mar 11, 2014
1 parent 036694a commit a2ddb09
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions index-dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ <h2>Usage</h2>

$('.textarea').wysihtml5({
'html': true,
'smallmodals': false,
locale: 'de-DE',
events: {
'load': function() {
Expand Down
1 change: 1 addition & 0 deletions readme.textile
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ h1. Release Notes
** Changed wysihtml implementation to wysihtml5x-0.4.3
** Added support for requirejs ("40": "https://github.com/Waxolunist/bootstrap3-wysihtml5-bower/issues/40")
* *0.2.10* (not yet released):
** Added option for small modals (adding class .modal-sm to .modal-dialog) ("42": "https://github.com/Waxolunist/bootstrap3-wysihtml5-bower/issues/42")
* *0.2.9* (2014/02/28):
** Added hebrew translation
** Updated spanish translations (es-ES, es-AR)
Expand Down
5 changes: 4 additions & 1 deletion src/bootstrap3-wysihtml5.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
'use strict';

var templates = function(key, locale, options) {
return wysihtml5.tpl[key]({locale: locale, options: options});
if(wysihtml5.tpl[key]) {
return wysihtml5.tpl[key]({locale: locale, options: options});
}
};

var Wysihtml5 = function(el, options) {
Expand Down Expand Up @@ -304,6 +306,7 @@
'html': false,
'link': true,
'image': true,
'smallmodals': false,
events: {},
parserRules: {
classes: {
Expand Down
2 changes: 1 addition & 1 deletion src/templates/image.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<li>
<div class="bootstrap-wysihtml5-insert-image-modal modal fade">
<div class="modal-dialog">
<div class="modal-dialog {{#if options.smallmodals}}modal-sm{{/if}}">
<div class="modal-content">
<div class="modal-header">
<a class="close" data-dismiss="modal">&times;</a>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/link.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<li>
<div class="bootstrap-wysihtml5-insert-link-modal modal fade">
<div class="modal-dialog">
<div class="modal-dialog {{#if options.smallmodals}}modal-sm{{/if}}">
<div class="modal-content">
<div class="modal-header">
<a class="close" data-dismiss="modal">&times;</a>
Expand Down

0 comments on commit a2ddb09

Please sign in to comment.