Permalink
Browse files

MDL-27890 tinymce - allow it to be smaller

  • Loading branch information...
1 parent d64baec commit 0e24cfb800fed24e0fe73f9117a0827ee4e96748 @stronk7 stronk7 committed Jul 7, 2011

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -9959,7 +9959,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
if (re.test('' + h))
- h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+ h = Math.max(parseInt(h) + (o.deltaHeight || 0),
+ s.theme_advanced_resizing_min_height || 100);
// Render UI
o = t.theme.renderUI({
@@ -9992,8 +9993,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
- if (h < 100)
- h = 100;
+ if (h < (s.theme_advanced_resizing_min_height || 100))
+ h = s.theme_advanced_resizing_min_height || 100;
t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -10810,7 +10810,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
if (re.test('' + h))
- h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+ h = Math.max(parseInt(h) + (o.deltaHeight || 0),
+ s.theme_advanced_resizing_min_height || 100);
// Render UI
o = t.theme.renderUI({
@@ -10843,8 +10844,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
- if (h < 100)
- h = 100;
+ if (h < (s.theme_advanced_resizing_min_height || 100))
+ h = s.theme_advanced_resizing_min_height || 100;
t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';
@@ -10783,7 +10783,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
if (re.test('' + h))
- h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+ h = Math.max(parseInt(h) + (o.deltaHeight || 0),
+ s.theme_advanced_resizing_min_height || 100);
// Render UI
o = t.theme.renderUI({
@@ -10816,8 +10817,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
- if (h < 100)
- h = 100;
+ if (h < (s.theme_advanced_resizing_min_height || 100))
+ h = s.theme_advanced_resizing_min_height || 100;
t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';

0 comments on commit 0e24cfb

Please sign in to comment.