Skip to content

Commit 285846a

Browse files
Thomas AndersenThomas Andersen
authored andcommitted
Dialog insert button value is changed to update if an embedded element is selected
1 parent 31d9cc8 commit 285846a

File tree

9 files changed

+45
-24
lines changed

9 files changed

+45
-24
lines changed

changelog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Version 1.1
2-
-
2+
- Dialog insert button value is changed to update if an embedded element is selected
33

44
Version 1.0
55
- Initial release

editor_plugin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor_plugin_src.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,23 @@
148148
},
149149

150150

151+
imagesToIframes : function( o )
152+
{
153+
var t = this,
154+
editor = t.editor,
155+
dom = editor.dom,
156+
iframe;
157+
158+
var imagePlaceHolders = dom.select( 'img[class="mceItemIframe"]', o.node );
159+
160+
tinymce.each( imagePlaceHolders, function( img )
161+
{
162+
iframe = t.createIframeElement( img );
163+
dom.replace( iframe, img );
164+
} );
165+
},
166+
167+
151168
createImagePlaceHolder : function( span )
152169
{
153170
var t = this,
@@ -190,24 +207,7 @@
190207
return image;
191208
},
192209

193-
194-
imagesToIframes : function( o )
195-
{
196-
var t = this,
197-
editor = t.editor,
198-
dom = editor.dom,
199-
iframe;
200-
201-
var imagePlaceHolders = dom.select( 'img[class="mceItemIframe"]', o.node );
202-
203-
tinymce.each( imagePlaceHolders, function( img )
204-
{
205-
iframe = t.createIframeElement( img );
206-
dom.replace( iframe, img );
207-
} );
208-
},
209-
210-
210+
211211
createIframeElement : function( imagePlaceHolder )
212212
{
213213
var t = this,

js/embed_dialog.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ var g_editor;
22
var g_textarea, g_previewContainer;
33
var g_update = false;
44

5+
var pathToCodeMirror = '../../../../examples/CodeMirror-0.8/';
6+
57
function init()
68
{
79
tinyMCEPopup.restoreSelection();
@@ -25,6 +27,8 @@ function init()
2527
if ( isPlaceholderElem )
2628
{
2729
g_update = true;
30+
31+
document.getElementById('insert').value = g_editor.getLang('embed.btn_update');
2832
}
2933

3034
htmlFragment = transformPlaceholderElem( selectedNode );
@@ -40,10 +44,22 @@ function init()
4044

4145
g_textarea.value = htmlFragment;
4246

47+
/*
48+
var codemirror = CodeMirror.fromTextArea('source', {
49+
parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js", "parsehtmlmixed.js"],
50+
stylesheet: ["" + pathToCodeMirror + "css/xmlcolors.css", ""+pathToCodeMirror+"css/jscolors.css", ""+pathToCodeMirror+"css/csscolors.css"],
51+
path: pathToCodeMirror + "js/",
52+
tabMode: "indent",
53+
reindentOnLoad: true
54+
});
55+
*/
56+
57+
4358
// Set time out since it seems Safari not always will update the preview on init.
4459
setTimeout(function() {
4560
updatePreview();
4661
}, 30);
62+
4763
}
4864

4965
function insertSource()

langs/da.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ title:"Embed kode",
44
source:"Kilde",
55
paste_your_embed_code_here:"S¾t ind embed kode her",
66
preview:"Forh\u00E5ndsvisning",
7-
btn_refresh:"Opdater"
7+
btn_refresh:"Genopfriske",
8+
btn_update:"Opdater"
89
});

langs/en.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ title:"Embed code",
44
source:"Source",
55
paste_your_embed_code_here:"Paste your embed code here",
66
preview:"Preview",
7-
btn_refresh:"Refresh"
7+
btn_refresh:"Refresh",
8+
btn_update:"Update"
89
});

langs/nb.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ title:"Embed kode",
44
source:"Kilde",
55
paste_your_embed_code_here:"Lim inn embed kode her",
66
preview:"Forh\u00E5ndsvisning",
7-
btn_refresh:"Oppfrisk"
7+
btn_refresh:"Oppfrisk",
8+
btn_update:"Oppdater"
89
});

langs/sv.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ title:"Embed kode",
44
source:"K\u00E4lla",
55
paste_your_embed_code_here:"Klistra in embed koda her",
66
preview:"F\u00F6rhandsgranska",
7-
btn_refresh:"Uppdatera"
7+
btn_refresh:"Uppfriska",
8+
btn_update:"Uppdatera"
89
});

window.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../tiny_mce_popup.js">//</script>
77
<script type="text/javascript" src="../../utils/mctabs.js">//</script>
88
<script type="text/javascript" src="../../utils/form_utils.js">//</script>
9+
<!--script type="text/javascript" src="../../../../examples/CodeMirror-0.8/js/codemirror.js">//</script-->
910
<script type="text/javascript" src="js/embed_dialog.js">//</script>
1011
<link href="css/embed_dialog.css" rel="stylesheet" type="text/css"/>
1112

0 commit comments

Comments
 (0)