Skip to content

Commit

Permalink
MDL-33041 fix tabs in all tinymce files except those we update from u…
Browse files Browse the repository at this point in the history
…pstream

The moodleimage plugin is a fork of standard advimage plugin,
the spellchecker is a fork of https://github.com/tinymce/tinymce_spellchecker_php.
  • Loading branch information
skodak committed Aug 13, 2012
1 parent 8ccb3ce commit 43552bd
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 173 deletions.
2 changes: 1 addition & 1 deletion lib/editor/tinymce/plugins/dragmath/dragmath.php
Expand Up @@ -72,7 +72,7 @@
<param name="java_code" value="Display/MainApplet.class" />
<param name="java_archive" value="DragMath.jar,lib/AbsoluteLayout.jar,lib/swing-layout-1.0.jar,lib/jdom.jar,lib/jep.jar" />
<param name="language" value="<?php echo $lang; ?>" />
<param name="outputFormat" value="MoodleTex" />
<param name="outputFormat" value="MoodleTex" />
<?php print_string('javaneeded', 'tinymce_dragmath', '<a href="http://www.java.com">Java.com</a>')?>
</object>
<form name="form" action="#">
Expand Down
132 changes: 66 additions & 66 deletions lib/editor/tinymce/plugins/dragmath/tinymce/editor_plugin.js
@@ -1,77 +1,77 @@
(function() {
// Do not load plugin language packs in moodle plugins.
// Do not load plugin language packs in moodle plugins.

tinymce.create('tinymce.plugins.DragMathPlugin', {
/**
* Initializes the plugin, this will be executed after the plugin has been created.
* This call is done before the editor instance has finished it's initialization so use the onInit event
* of the editor instance to intercept that event.
*
* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
* @param {string} url Absolute URL to where the plugin is located.
*/
init : function(ed, url) {
// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
lang = tinyMCE.activeEditor.getParam('language');
tinymce.create('tinymce.plugins.DragMathPlugin', {
/**
* Initializes the plugin, this will be executed after the plugin has been created.
* This call is done before the editor instance has finished it's initialization so use the onInit event
* of the editor instance to intercept that event.
*
* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
* @param {string} url Absolute URL to where the plugin is located.
*/
init : function(ed, url) {
// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
lang = tinyMCE.activeEditor.getParam('language');

ed.addCommand('mceDragMath', function() {
ed.windowManager.open({
ed.addCommand('mceDragMath', function() {
ed.windowManager.open({

file : ed.getParam("moodle_plugin_base") + 'dragmath/dragmath.php?lang=' + lang,
width : 540,
height : 380,
inline : 1
}, {
plugin_url : url, // Plugin absolute URL
some_custom_arg : 'custom arg' // Custom argument
});
});
file : ed.getParam("moodle_plugin_base") + 'dragmath/dragmath.php?lang=' + lang,
width : 540,
height : 380,
inline : 1
}, {
plugin_url : url, // Plugin absolute URL
some_custom_arg : 'custom arg' // Custom argument
});
});

// Register example button.
ed.addButton('dragmath', {
title : 'dragmath.desc',
cmd : 'mceDragMath',
image : url + '/img/dragmath.gif'
});
// Register example button.
ed.addButton('dragmath', {
title : 'dragmath.desc',
cmd : 'mceDragMath',
image : url + '/img/dragmath.gif'
});


// Add a node change handler, selects the button in the UI when a image is selected.
ed.onNodeChange.add(function(ed, cm, n) {
cm.setActive('dragmath', n.nodeName == 'IMG');
});
},
// Add a node change handler, selects the button in the UI when a image is selected.
ed.onNodeChange.add(function(ed, cm, n) {
cm.setActive('dragmath', n.nodeName == 'IMG');
});
},

/**
* Creates control instances based in the incomming name. This method is normally not
* needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
* but you sometimes need to create more complex controls like listboxes, split buttons etc then this
* method can be used to create those.
*
* @param {String} n Name of the control to create.
* @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
* @return {tinymce.ui.Control} New control instance or null if no control was created.
*/
createControl : function(n, cm) {
return null;
},
/**
* Creates control instances based in the incomming name. This method is normally not
* needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
* but you sometimes need to create more complex controls like listboxes, split buttons etc then this
* method can be used to create those.
*
* @param {String} n Name of the control to create.
* @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
* @return {tinymce.ui.Control} New control instance or null if no control was created.
*/
createControl : function(n, cm) {
return null;
},

/**
* Returns information about the plugin as a name/value array.
* The current keys are longname, author, authorurl, infourl and version.
*
* @return {Object} Name/value array containing information about the plugin.
*/
getInfo : function() {
return {
longname : 'Moodle Dragmath plugin',
author : 'Glen Davies',
authorurl : 'http://www.canterbury.ac.nz',
infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',
version : "1.0"
};
}
});
/**
* Returns information about the plugin as a name/value array.
* The current keys are longname, author, authorurl, infourl and version.
*
* @return {Object} Name/value array containing information about the plugin.
*/
getInfo : function() {
return {
longname : 'Moodle Dragmath plugin',
author : 'Glen Davies',
authorurl : 'http://www.canterbury.ac.nz',
infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',
version : "1.0"
};
}
});

// Register plugin.
tinymce.PluginManager.add('dragmath', tinymce.plugins.DragMathPlugin);
// Register plugin.
tinymce.PluginManager.add('dragmath', tinymce.plugins.DragMathPlugin);
})();
@@ -1,4 +1,4 @@
#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
.moodlebutton {
font-size: 1.5em;
font-weight:bold;
Expand Down
78 changes: 39 additions & 39 deletions lib/editor/tinymce/plugins/moodlemedia/tinymce/editor_plugin.js
Expand Up @@ -3,51 +3,51 @@
*/

(function() {
var each = tinymce.each;

tinymce.PluginManager.requireLangPack('moodlemedia');

tinymce.create('tinymce.plugins.MoodlemediaPlugin', {
init : function(ed, url) {
var t = this;

t.editor = ed;
t.url = url;

// Register commands.
ed.addCommand('mceMoodleMedia', function() {
ed.windowManager.open({
file : url + '/moodlemedia.htm',
width : 480 + parseInt(ed.getLang('media.delta_width', 0)),
height : 480 + parseInt(ed.getLang('media.delta_height', 0)),
inline : 1
}, {
plugin_url : url
});
});

// Register buttons.
ed.addButton('moodlemedia', {
var each = tinymce.each;

tinymce.PluginManager.requireLangPack('moodlemedia');

tinymce.create('tinymce.plugins.MoodlemediaPlugin', {
init : function(ed, url) {
var t = this;

t.editor = ed;
t.url = url;

// Register commands.
ed.addCommand('mceMoodleMedia', function() {
ed.windowManager.open({
file : url + '/moodlemedia.htm',
width : 480 + parseInt(ed.getLang('media.delta_width', 0)),
height : 480 + parseInt(ed.getLang('media.delta_height', 0)),
inline : 1
}, {
plugin_url : url
});
});

// Register buttons.
ed.addButton('moodlemedia', {
title : 'moodlemedia.desc',
image : url + '/img/icon.gif',
cmd : 'mceMoodleMedia'});

},
},

_parse : function(s) {
return tinymce.util.JSON.parse('{' + s + '}');
},
_parse : function(s) {
return tinymce.util.JSON.parse('{' + s + '}');
},

getInfo : function() {
return {
longname : 'Moodle media',
author : 'Dongsheng Cai <dongsheng@moodle.com>',
version : "1.0"
};
}
getInfo : function() {
return {
longname : 'Moodle media',
author : 'Dongsheng Cai <dongsheng@moodle.com>',
version : "1.0"
};
}

});
});

// Register plugin.
tinymce.PluginManager.add('moodlemedia', tinymce.plugins.MoodlemediaPlugin);
// Register plugin.
tinymce.PluginManager.add('moodlemedia', tinymce.plugins.MoodlemediaPlugin);
})();
48 changes: 24 additions & 24 deletions lib/editor/tinymce/plugins/moodlemedia/tinymce/moodlemedia.htm
Expand Up @@ -32,42 +32,42 @@
}

</script>
<script type="text/javascript" src="js/media.js"></script>
<link href="css/media.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="js/media.js"></script>
<link href="css/media.css" rel="stylesheet" type="text/css" />
</head>
<body style="display: none">
<form onsubmit="insertMedia();return false;" action="#">
<div class="panel_wrapper">
<div id="general_panel" class="panel current">
<div class="panel_wrapper">
<div id="general_panel" class="panel current">
<input id="src" name="src" type="hidden" value="" class="mceFocus" onchange="generatePreview();" />
<input id="filename" name="filename" type="hidden" value="" />
<fieldset>
<legend>{#media_dlg.general}</legend>
<fieldset>
<legend>{#media_dlg.general}</legend>

<table align="center" border="0" cellpadding="4" cellspacing="0">
<table align="center" border="0" cellpadding="4" cellspacing="0">
<tr align="center">
<td colspan='2' id="filebrowsercontainer">&nbsp;</td>
</tr>
</table>
</fieldset>
</table>
</fieldset>

<fieldset>
<legend>{#media_dlg.preview}</legend>
<div id="prev"></div>
</fieldset>
</div>
<fieldset>
<legend>{#media_dlg.preview}</legend>
<div id="prev"></div>
</fieldset>
</div>

</div>
</div>

<div class="mceActionPanel">
<div style="float: left">
<input type="submit" id="insert" name="insert" value="{#insert}" />
</div>
<div class="mceActionPanel">
<div style="float: left">
<input type="submit" id="insert" name="insert" value="{#insert}" />
</div>

<div style="float: right">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</div>
</form>
<div style="float: right">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</div>
</form>
</body>
</html>

0 comments on commit 43552bd

Please sign in to comment.