]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-14741: Removing the old moodleimage plugin - the TinyMCE builtin plugin does...
authorscyrma <scyrma>
Thu, 31 Jul 2008 03:18:40 +0000 (03:18 +0000)
committerscyrma <scyrma>
Thu, 31 Jul 2008 03:18:40 +0000 (03:18 +0000)
lib/editor/tinymce.js.php
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin.js [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin_src.js [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/img/image.gif [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/image.js [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/moodleimage.js [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/langs/en_dlg.js [deleted file]
lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/preview.php [deleted file]

index 986da2ff74a11211740f84b35e52fb6a3198db5a..a50335c4e6ed4c7f6fa73953a77527e764c0bb86 100644 (file)
@@ -178,7 +178,7 @@ echo <<<EOF
         entity_encoding: "raw",
         language: "$editorlanguage",
         directionality: "$directionality",
-        plugins: "safari,spellchecker,table,style,layer,advhr,advimage,advlink,emoticons,inlinepopups,media,searchreplace,paste,standardmenu,directionality,fullscreen,moodleimage,moodlelink,moodlenolink,dragmath,nonbreaking,contextmenu",
+        plugins: "safari,spellchecker,table,style,layer,advhr,advimage,advlink,emoticons,inlinepopups,media,searchreplace,paste,standardmenu,directionality,fullscreen,moodlelink,moodlenolink,dragmath,nonbreaking,contextmenu",
         theme_advanced_layout_manager: "SimpleLayout",
         theme_advanced_toolbar_align : "left",
         theme_advanced_buttons1: "fontselect,fontsizeselect,formatselect,styleselect",
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin.js
deleted file mode 100644 (file)
index c9b517f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-(function(){tinymce.create('tinymce.plugins.MoodleImagePlugin',{init:function(ed,url){course_id=tinyMCE.activeEditor.getParam('moodleimage_course_id');ed.addCommand('mceMoodleImage',function(){ed.windowManager.open({file:url+'/insert_image.php?id='+course_id,width:600+ed.getLang('example.delta_width',0),height:500+ed.getLang('example.delta_height',0),inline:1},{plugin_url:url,some_custom_arg:'custom arg'});});ed.addButton('moodleimage',{title:'Insert Image',cmd:'mceMoodleImage',image:url+'/img/image.gif'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('moodleimage',n.nodeName=='IMG');});},createControl:function(n,cm){return null;},getInfo:function(){return{longname:'Moodle Image plugin',author:'Glen Davies',authorurl:'http://www.canterbury.ac.nz',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',version:"1.0"};}});tinymce.PluginManager.add('moodleimage',tinymce.plugins.MoodleImagePlugin);})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin_src.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/editor_plugin_src.js
deleted file mode 100644 (file)
index ad53c44..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-(function() {\r
-       // Load plugin specific language pack\r
-       //tinymce.PluginManager.requireLangPack('example');\r
-\r
-       tinymce.create('tinymce.plugins.MoodleImagePlugin', {\r
-               /**\r
-                * Initializes the plugin, this will be executed after the plugin has been created.\r
-                * This call is done before the editor instance has finished it's initialization so use the onInit event\r
-                * of the editor instance to intercept that event.\r
-                *\r
-                * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.\r
-                * @param {string} url Absolute URL to where the plugin is located.\r
-                */\r
-               init : function(ed, url) {\r
-                       // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');\r
-                       course_id = tinyMCE.activeEditor.getParam('moodleimage_course_id');\r
-                       ed.addCommand('mceMoodleImage', function() {\r
-                               ed.windowManager.open({\r
-                                       \r
-                                       file : url + '/insert_image.php?id=' + course_id,\r
-                                       //file : '/moodle/lib/editor/htmlarea/popups/insert_image.php?id=' + course_id,\r
-                                       width : 600 + ed.getLang('example.delta_width', 0),\r
-                                       height : 500 + ed.getLang('example.delta_height', 0),\r
-                                       inline : 1\r
-                               }, {\r
-                                       plugin_url : url, // Plugin absolute URL\r
-                                       some_custom_arg : 'custom arg' // Custom argument\r
-                               });\r
-                       });\r
-\r
-                       // Register example button\r
-                       ed.addButton('moodleimage', {\r
-                               title : 'Insert Image',\r
-                               cmd : 'mceMoodleImage',\r
-                               image : url + '/img/image.gif'\r
-                       });\r
-                       \r
-\r
-                       // Add a node change handler, selects the button in the UI when a image is selected\r
-                       ed.onNodeChange.add(function(ed, cm, n) {\r
-                               cm.setActive('moodleimage', n.nodeName == 'IMG');\r
-                       });\r
-               },\r
-\r
-               /**\r
-                * Creates control instances based in the incomming name. This method is normally not\r
-                * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons\r
-                * but you sometimes need to create more complex controls like listboxes, split buttons etc then this\r
-                * method can be used to create those.\r
-                *\r
-                * @param {String} n Name of the control to create.\r
-                * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.\r
-                * @return {tinymce.ui.Control} New control instance or null if no control was created.\r
-                */\r
-               createControl : function(n, cm) {\r
-                       return null;\r
-               },\r
-\r
-               /**\r
-                * Returns information about the plugin as a name/value array.\r
-                * The current keys are longname, author, authorurl, infourl and version.\r
-                *\r
-                * @return {Object} Name/value array containing information about the plugin.\r
-                */\r
-               getInfo : function() {\r
-                       return {\r
-                               longname : 'Moodle Image plugin',\r
-                               author : 'Glen Davies',\r
-                               authorurl : 'http://www.canterbury.ac.nz',\r
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',\r
-                               version : "1.0"\r
-                       };\r
-               }\r
-       });\r
-\r
-       // Register plugin\r
-       tinymce.PluginManager.add('moodleimage', tinymce.plugins.MoodleImagePlugin);\r
-})();
\ No newline at end of file
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/img/image.gif b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/img/image.gif
deleted file mode 100644 (file)
index 41d1d6e..0000000
Binary files a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/img/image.gif and /dev/null differ
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/insert_image.php
deleted file mode 100644 (file)
index d1f85e1..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php // $Id$\r
-\r
-    require("../../../../../../../config.php");\r
-\r
-\r
-    if (!empty($_SESSION['id'])) {\r
-               $id = optional_param('id', $_SESSION['id'], PARAM_INT);\r
-       } else {\r
-               $id = optional_param('id', SITEID, PARAM_INT);\r
-       }\r
-\r
-    require_login($id);\r
-    require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));\r
-\r
-    @header('Content-Type: text/html; charset=utf-8');\r
-\r
-    $upload_max_filesize = get_max_upload_file_size($CFG->maxbytes);\r
-\r
-?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html>\r
-<head>\r
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />\r
-<title>{#moodleimage_dlg.title}</title>\r
-\r
-<script type="text/javascript" src="../../tiny_mce_popup.js"></script>\r
-<script type="text/javascript" src="../../utils/form_utils.js"></script>\r
-<script type="text/javascript" src="js/moodleimage.js"></script>\r
-<base target="_self" />\r
-<script type="text/javascript">\r
-//<![CDATA[\r
-var preview_window = null;\r
-\r
-\r
-function onPreview() {\r
-  var f_url = document.getElementById("f_url");\r
-  var url = f_url.value;\r
-  if (!url) {\r
-    alert("<?php print_string("enterurlfirst","editor");?>");\r
-    f_url.focus();\r
-    return false;\r
-  }\r
-  var img = new Image();\r
-  img.src = url;\r
-  var win = null;\r
-  if (!document.all) {\r
-    win = window.open("about:blank", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");\r
-  } else {\r
-    win = window.open("about:blank", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");\r
-  }\r
-  preview_window = win;\r
-  var doc = win.document;\r
-  var body = doc.body;\r
-  if (body) {\r
-    body.innerHTML = "";\r
-    body.style.padding = "0px";\r
-    body.style.margin = "0px";\r
-    var el = doc.createElement("img");\r
-    el.src = url;\r
-\r
-    var table = doc.createElement("table");\r
-    body.appendChild(table);\r
-    table.style.width = "100%";\r
-    table.style.height = "100%";\r
-    var tbody = doc.createElement("tbody");\r
-    table.appendChild(tbody);\r
-    var tr = doc.createElement("tr");\r
-    tbody.appendChild(tr);\r
-    var td = doc.createElement("td");\r
-    tr.appendChild(td);\r
-    td.style.textAlign = "center";\r
-\r
-    td.appendChild(el);\r
-    win.resizeTo(el.offsetWidth + 30, el.offsetHeight + 30);\r
-  }\r
-  win.focus();\r
-  return false;\r
-};\r
-\r
-function checkvalue(elm,formname) {\r
-    var el = document.getElementById(elm);\r
-    if(!el.value) {\r
-        alert("Nothing to do!");\r
-        el.focus();\r
-        return false;\r
-    }\r
-}\r
-\r
-function submit_form(dothis) {\r
-    if(dothis == "delete") {\r
-        window.ibrowser.document.dirform.action.value = "delete";\r
-    }\r
-    if(dothis == "move") {\r
-        window.ibrowser.document.dirform.action.value = "move";\r
-    }\r
-    if(dothis == "zip") {\r
-        window.ibrowser.document.dirform.action.value = "zip";\r
-    }\r
-\r
-    window.ibrowser.document.dirform.submit();\r
-    return false;\r
-}\r
-\r
-//]]>\r
-</script>\r
-<style type="text/css">\r
-html, body {\r
-margin: 2px;\r
-background-color: #F0F0EE;\r
-font-size: 11px;\r
-}\r
-.title {\r
-background-color: #ddddff;\r
-padding: 5px;\r
-border-bottom: 1px solid black;\r
-font-family: Tahoma, sans-serif;\r
-font-weight: bold;\r
-font-size: 14px;\r
-color: black;\r
-}\r
-td, input, select, button {\r
-font-family: Tahoma, Verdana, sans-serif;\r
-font-size: 11px;\r
-}\r
-button { width: 70px; }\r
-.space { padding: 2px; }\r
-form { margin-bottom: 0px; margin-top: 0px; }\r
-</style>\r
-</head>\r
-<body>\r
-\r
-  <form action="" method="get" id="first">\r
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-      <tr>\r
-        <td width="15%" align="right"><?php print_string("imageurl","editor");?>:</td>\r
-        <td width="60%"><input name="f_url" type="text" id="f_url" style="width: 100%;" /></td>\r
-        <td width="23%" align="center">\r
-          <button name="btnOK" type="button" id="btnOK" onclick="return MoodleImageDialog.insert();"><?php print_string("ok","editor") ?></button></td>\r
-      </tr>\r
-      <tr>\r
-        <td align="right"><?php print_string("alternatetext","editor");?>:</td>\r
-        <td><input name="f_alt" type="text" id="f_alt" style="width: 100%;" /></td>\r
-        <td align="center">\r
-          <button name="btnCancel" type="button" id="btnCancel" onclick="return tinyMCEPopup.close();"><?php print_string("cancel","editor") ?></button></td>\r
-      </tr>\r
-    </table>\r
-    <div class="space"></div>\r
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-      <tr>\r
-        <td width="32%" valign="top">\r
-        <fieldset style="height:60px"><legend><?php print_string("layout","editor");?></legend>\r
-        <div class="space"></div>\r
-          <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-            <tr>\r
-              <td width="40%" align="right"><?php print_string("alignment","editor");?>:</td>\r
-              <td width="60%">\r
-                <select size="1" name="f_align" id="f_align"\r
-                title="Positioning of this image">\r
-                <option value=""                       ><?php print_string("notset","editor") ?></option>\r
-                <option value="left"                   ><?php print_string("left","editor") ?></option>\r
-                <option value="right"                  ><?php print_string("right","editor") ?></option>\r
-                <option value="texttop"                ><?php print_string("texttop","editor") ?></option>\r
-                <option value="middle"              ><?php print_string("middle","editor") ?></option>\r
-                <option value="baseline" selected="1"  ><?php print_string("baseline","editor") ?></option>\r
-                <option value="absbottom"              ><?php print_string("absbottom","editor") ?></option>\r
-                <option value="bottom"                 ><?php print_string("bottom","editor") ?></option>\r
-                <option value="middle"                 ><?php print_string("middle","editor") ?></option>\r
-                <option value="top"                    ><?php print_string("top","editor") ?></option>\r
-                </select></td>\r
-      </tr>\r
-      <tr>\r
-              <td width="40%" align="right"><?php print_string("borderthickness","editor") ?>:</td>\r
-              <td width="60%">\r
-                <input type="text" id="f_border" name="f_border" size="5" /></td>\r
-            </tr>\r
-        </table><div class="space"></div>\r
-        </fieldset>&nbsp;</td>\r
-        <td width="34%" valign="top">\r
-        <fieldset style="height:60px"><legend><?php print_string("spacing","editor");?></legend>\r
-        <div class="space"></div>\r
-          <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-            <tr>\r
-              <td width="40%" align="right"><?php print_string("horizontal","editor");?>: </td>\r
-              <td width="60%">\r
-                <input name="f_horiz" type="text" id="f_horiz" size="5" />\r
-              </td>\r
-            </tr>\r
-            <tr>\r
-              <td width="40%" align="right"><?php print_string("vertical","editor");?>:</td>\r
-              <td width="60%">\r
-                <input name="f_vert" type="text" id="f_vert" size="5" /></td>\r
-            </tr>\r
-          </table><div class="space"></div></fieldset></td>\r
-        <td width="34%" valign="top">\r
-        <fieldset style="height:60px"><legend><?php print_string("size","editor");?></legend>\r
-        <div class="space"></div>\r
-          <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-            <tr>\r
-              <td width="40%" align="right"><?php print_string("width","editor");?>:</td>\r
-              <td width="60%">\r
-                <input name="f_width" type="text" id="f_width" size="5" />\r
-              </td>\r
-            </tr>\r
-            <tr>\r
-              <td width="40%" align="right"><?php print_string("height","editor");?>:</td>\r
-              <td width="60%">\r
-                <input name="f_height" type="text" id="f_height" size="5"  />\r
-                \r
-                </td>\r
-            </tr>\r
-            </table><div class="space"></div>\r
-            </fieldset></td>\r
-    </tr>\r
-  </table></form>\r
-  <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-    <tr>\r
-      <td width="55%" valign="top"><?php\r
-          print_string("filebrowser","editor");\r
-          echo "<br />";\r
-          echo "<iframe id=\"ibrowser\" name=\"ibrowser\" src=\"{$CFG->httpswwwroot}/lib/editor/tinymce/coursefiles.php?usecheckboxes=1&id=$id\" style=\"width: 100%; height: 200px;\"></iframe>";\r
-      ?>\r
-      </td>\r
-      <td width="45%" valign="top"><?php print_string("preview","editor");?>:<br />\r
-      <iframe id="ipreview" name="ipreview" src="about:blank" style="width: 100%; height: 200px;"></iframe>\r
-      </td>\r
-    </tr>\r
-  </table>\r
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">\r
-      <tr>\r
-        <td width="55%"><div class="space"></div>\r
-        <?php if(has_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id))) { ?>\r
-        <table border="0" cellpadding="2" cellspacing="0">\r
-          <tr><td><?php print_string("selection","editor");?>: </td>\r
-          <td><form id="idelete">\r
-          <input name="btnDelete" type="submit" id="btnDelete" value="<?php print_string("delete","editor");?>" onclick="return submit_form('delete');" /></form></td>\r
-          <td><form id="imove">\r
-          <input name="btnMove" type="submit" id="btnMove" value="<?php print_string("move","editor");?>" onclick="return submit_form('move');" /></td>\r
-          <td><form id="izip">\r
-          <input name="btnZip" type="submit" id="btnZip" value="<?php print_string("zip","editor");?>" onclick="return submit_form('zip');" /></form></td>\r
-          <td><form method="post" action="../../../coursefiles.php" target="ibrowser">\r
-          <input type="hidden" name="id" value="<?php print($id);?>" />\r
-          <input type="hidden" name="wdir" value="" />\r
-          <input type="hidden" id="irename" name="file" value="" />\r
-          <input type="hidden" name="action" value="rename" />\r
-          <input type="hidden" name="sesskey" value="<?php p($USER->sesskey) ?>" />\r
-          <input name="btnRename" type="submit" id="btnRename" value="<?php print_string("rename","editor");?>" /></form></td>\r
-          <tr></table>\r
-          <br />\r
-          <?php\r
-          } else {\r
-              print "";\r
-          } ?>\r
-        </td>\r
-      <td width="45%" rowspan="2" valign="top"><fieldset>\r
-          <legend><?php print_string("properties","editor");?></legend>\r
-          <div class="space"></div>\r
-          <div class="space"></div>\r
-          &nbsp;&nbsp;<?php print_string("size","editor");?>:\r
-          <input type="text" id="isize" name="isize" size="10" style="background: transparent; border: none;" />\r
-      <?php print_string("type","editor");?>: <input type="text" id="itype" name="itype" size="10" style="background: transparent; border: none;" />\r
-      <div class="space"></div>\r
-      <div class="space"></div>\r
-      </fieldset></td>\r
-    </tr>\r
-    <tr>\r
-      <td height="22">\r
-          <form id="cfolder" action="<?php echo $CFG->httpswwwroot;?>/lib/editor/tinymce/coursefiles.php" method="post" target="ibrowser">\r
-          <input type="hidden" name="id" value="<?php print($id);?>" />\r
-          <input type="hidden" name="wdir" value="" />\r
-          <input type="hidden" name="action" value="mkdir" />\r
-          <input type="hidden" name="sesskey" value="<?php p($USER->sesskey) ?>" />\r
-          \r
-          <input name="name" type="text" id="foldername" size="35" />\r
-         <input name="btnCfolder" type="submit" id="btnCfolder" value="Create_folder" onclick="return checkvalue('foldername','cfolder');" />\r
-          \r
-          </form>\r
-          <div class="space"></div>\r
-          <form action="<?php echo $CFG->httpswwwroot;?>/lib/editor/tinymce/coursefiles.php?id=<?php print($id);?>" method="post" enctype="multipart/form-data" target="ibrowser" id="uploader">\r
-          <input type="hidden" name="MAX_FILE_SIZE" value="<?php print($upload_max_filesize);?>" />\r
-          <input type="hidden" name="id" VALUE="<?php print($id);?>" />\r
-          <input type="hidden" name="wdir" value="" />\r
-          <input type="hidden" name="action" value="upload" />\r
-          <input type="hidden" name="sesskey" value="<?php p($USER->sesskey) ?>" />\r
-          <input type="file" name="userfile" id="userfile" size="35" />\r
-          <input name="save" type="submit" id="save" onclick="return checkvalue('userfile','uploader');" value="<?php print_string("upload","editor");?>" />\r
-          \r
-          </form>\r
-      </td>\r
-    </tr>\r
-  </table>\r
-  <p>&nbsp;</p>\r
-</body>\r
-</html>\r
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/image.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/image.js
deleted file mode 100644 (file)
index 9a26c0a..0000000
+++ /dev/null
@@ -1,414 +0,0 @@
-var ImageDialog = {\r
-       preInit : function() {\r
-               var url;\r
-\r
-               tinyMCEPopup.requireLangPack();\r
-\r
-               if (url = tinyMCEPopup.getParam("external_image_list_url"))\r
-                       document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');\r
-       },\r
-\r
-       init : function(ed) {\r
-               var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();\r
-\r
-               tinyMCEPopup.resizeToInnerSize();\r
-               this.fillClassList('class_list');\r
-               this.fillFileList('src_list', 'tinyMCEImageList');\r
-               this.fillFileList('over_list', 'tinyMCEImageList');\r
-               this.fillFileList('out_list', 'tinyMCEImageList');\r
-\r
-               if (n.nodeName == 'IMG') {\r
-                       nl.src.value = dom.getAttrib(n, 'src');\r
-                       nl.width.value = dom.getAttrib(n, 'width');\r
-                       nl.height.value = dom.getAttrib(n, 'height');\r
-                       nl.alt.value = dom.getAttrib(n, 'alt');\r
-                       nl.title.value = dom.getAttrib(n, 'title');\r
-                       nl.vspace.value = this.getAttrib(n, 'vspace');\r
-                       nl.hspace.value = this.getAttrib(n, 'hspace');\r
-                       nl.border.value = this.getAttrib(n, 'border');\r
-                       selectByValue(f, 'align', this.getAttrib(n, 'align'));\r
-                       selectByValue(f, 'class_list', dom.getAttrib(n, 'class'));\r
-                       nl.style.value = dom.getAttrib(n, 'style');\r
-                       nl.id.value = dom.getAttrib(n, 'id');\r
-                       nl.dir.value = dom.getAttrib(n, 'dir');\r
-                       nl.lang.value = dom.getAttrib(n, 'lang');\r
-                       nl.usemap.value = dom.getAttrib(n, 'usemap');\r
-                       nl.longdesc.value = dom.getAttrib(n, 'longdesc');\r
-                       nl.insert.value = ed.getLang('update');\r
-\r
-                       if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))\r
-                               nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');\r
-\r
-                       if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))\r
-                               nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');\r
-               }\r
-\r
-               // Setup browse button\r
-               document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');\r
-               if (isVisible('srcbrowser'))\r
-                       document.getElementById('src').style.width = '260px';\r
-\r
-               // Setup browse button\r
-               document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');\r
-               if (isVisible('overbrowser'))\r
-                       document.getElementById('onmouseoversrc').style.width = '260px';\r
-\r
-               // Setup browse button\r
-               document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');\r
-               if (isVisible('outbrowser'))\r
-                       document.getElementById('onmouseoutsrc').style.width = '260px';\r
-\r
-               // If option enabled default contrain proportions to checked\r
-               if (ed.getParam("advimage_constrain_proportions", true))\r
-                       f.constrain.checked = true;\r
-\r
-               // Check swap image if valid data\r
-               if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)\r
-                       this.setSwapImage(true);\r
-               else\r
-                       this.setSwapImage(false);\r
-\r
-               this.changeAppearance();\r
-               this.updateStyle();\r
-               this.showPreviewImage(nl.src.value, 1);\r
-       },\r
-\r
-       insert : function(file, title) {\r
-               var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];\r
-\r
-               if (f.src.value === '') {\r
-                       ed.dom.remove(ed.selection.getNode());\r
-                       ed.execCommand('mceRepaint');\r
-                       tinyMCEPopup.close();\r
-                       return;\r
-               }\r
-\r
-               if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {\r
-                       if (!f.alt.value) {\r
-                               tinyMCEPopup.editor.windowManager.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {\r
-                                       if (s)\r
-                                               t.insertAndClose();\r
-                               });\r
-\r
-                               return;\r
-                       }\r
-               }\r
-\r
-               t.insertAndClose();\r
-       },\r
-\r
-       insertAndClose : function() {\r
-               var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;\r
-\r
-               // Fixes crash in Safari\r
-               if (tinymce.isWebKit)\r
-                       ed.getWin().focus();\r
-\r
-               if (!ed.settings.inline_styles) {\r
-                       args = tinymce.extend(args, {\r
-                               vspace : nl.vspace.value,\r
-                               hspace : nl.hspace.value,\r
-                               border : nl.border.value,\r
-                               align : getSelectValue(f, 'align')\r
-                       });\r
-               }\r
-\r
-               tinymce.extend(args, {\r
-                       src : nl.src.value,\r
-                       width : nl.width.value,\r
-                       height : nl.height.value,\r
-                       alt : nl.alt.value,\r
-                       title : nl.title.value,\r
-                       'class' : getSelectValue(f, 'class_list'),\r
-                       style : nl.style.value,\r
-                       id : nl.id.value,\r
-                       dir : nl.dir.value,\r
-                       lang : nl.lang.value,\r
-                       usemap : nl.usemap.value,\r
-                       longdesc : nl.longdesc.value\r
-               });\r
-\r
-               args.onmouseover = args.onmouseout = '';\r
-\r
-               if (f.onmousemovecheck.checked) {\r
-                       if (nl.onmouseoversrc.value)\r
-                               args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";\r
-\r
-                       if (nl.onmouseoutsrc.value)\r
-                               args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";\r
-               }\r
-\r
-               el = ed.selection.getNode();\r
-\r
-               if (el && el.nodeName == 'IMG') {\r
-                       ed.dom.setAttribs(el, args);\r
-               } else {\r
-                       ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" src="javascript:;" />');\r
-                       ed.dom.setAttribs('__mce_tmp', args);\r
-                       ed.dom.setAttrib('__mce_tmp', 'id', '');\r
-               }\r
-\r
-               tinyMCEPopup.close();\r
-       },\r
-\r
-       getAttrib : function(e, at) {\r
-               var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;\r
-\r
-               if (ed.settings.inline_styles) {\r
-                       switch (at) {\r
-                               case 'align':\r
-                                       if (v = dom.getStyle(e, 'float'))\r
-                                               return v;\r
-\r
-                                       if (v = dom.getStyle(e, 'vertical-align'))\r
-                                               return v;\r
-\r
-                                       break;\r
-\r
-                               case 'hspace':\r
-                                       v = dom.getStyle(e, 'margin-left')\r
-                                       v2 = dom.getStyle(e, 'margin-right');\r
-                                       if (v && v == v2)\r
-                                               return parseInt(v.replace(/[^0-9]/g, ''));\r
-\r
-                                       break;\r
-\r
-                               case 'vspace':\r
-                                       v = dom.getStyle(e, 'margin-top')\r
-                                       v2 = dom.getStyle(e, 'margin-bottom');\r
-                                       if (v && v == v2)\r
-                                               return parseInt(v.replace(/[^0-9]/g, ''));\r
-\r
-                                       break;\r
-\r
-                               case 'border':\r
-                                       v = 0;\r
-\r
-                                       tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {\r
-                                               sv = dom.getStyle(e, 'border-' + sv + '-width');\r
-\r
-                                               // False or not the same as prev\r
-                                               if (!sv || (sv != v && v !== 0)) {\r
-                                                       v = 0;\r
-                                                       return false;\r
-                                               }\r
-\r
-                                               if (sv)\r
-                                                       v = sv;\r
-                                       });\r
-\r
-                                       if (v)\r
-                                               return parseInt(v.replace(/[^0-9]/g, ''));\r
-\r
-                                       break;\r
-                       }\r
-               }\r
-\r
-               if (v = dom.getAttrib(e, at))\r
-                       return v;\r
-\r
-               return '';\r
-       },\r
-\r
-       setSwapImage : function(st) {\r
-               var f = document.forms[0];\r
-\r
-               f.onmousemovecheck.checked = st;\r
-               setBrowserDisabled('overbrowser', !st);\r
-               setBrowserDisabled('outbrowser', !st);\r
-\r
-               if (f.over_list)\r
-                       f.over_list.disabled = !st;\r
-\r
-               if (f.out_list)\r
-                       f.out_list.disabled = !st;\r
-\r
-               f.onmouseoversrc.disabled = !st;\r
-               f.onmouseoutsrc.disabled  = !st;\r
-       },\r
-\r
-       fillClassList : function(id) {\r
-               var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;\r
-\r
-               if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {\r
-                       cl = [];\r
-\r
-                       tinymce.each(v.split(';'), function(v) {\r
-                               var p = v.split('=');\r
-\r
-                               cl.push({'title' : p[0], 'class' : p[1]});\r
-                       });\r
-               } else\r
-                       cl = tinyMCEPopup.editor.dom.getClasses();\r
-\r
-               if (cl.length > 0) {\r
-                       lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');\r
-\r
-                       tinymce.each(cl, function(o) {\r
-                               lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);\r
-                       });\r
-               } else\r
-                       dom.remove(dom.getParent(id, 'tr'));\r
-       },\r
-\r
-       fillFileList : function(id, l) {\r
-               var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;\r
-\r
-               l = window[l];\r
-\r
-               if (l && l.length > 0) {\r
-                       lst.options[lst.options.length] = new Option('', '');\r
-\r
-                       tinymce.each(l, function(o) {\r
-                               lst.options[lst.options.length] = new Option(o[0], o[1]);\r
-                       });\r
-               } else\r
-                       dom.remove(dom.getParent(id, 'tr'));\r
-       },\r
-\r
-       resetImageData : function() {\r
-               var f = document.forms[0];\r
-\r
-               f.elements.width.value = f.elements.height.value = '';\r
-       },\r
-\r
-       updateImageData : function(img, st) {\r
-               var f = document.forms[0];\r
-\r
-               if (!st) {\r
-                       f.elements.width.value = img.width;\r
-                       f.elements.height.value = img.height;\r
-               }\r
-\r
-               this.preloadImg = img;\r
-       },\r
-\r
-       changeAppearance : function() {\r
-               var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');\r
-\r
-               if (img) {\r
-                       if (ed.getParam('inline_styles')) {\r
-                               ed.dom.setAttrib(img, 'style', f.style.value);\r
-                       } else {\r
-                               img.align = f.align.value;\r
-                               img.border = f.border.value;\r
-                               img.hspace = f.hspace.value;\r
-                               img.vspace = f.vspace.value;\r
-                       }\r
-               }\r
-       },\r
-\r
-       changeHeight : function() {\r
-               var f = document.forms[0], tp, t = this;\r
-\r
-               if (!f.constrain.checked || !t.preloadImg) {\r
-                       t.updateStyle();\r
-                       return;\r
-               }\r
-\r
-               if (f.width.value == "" || f.height.value == "")\r
-                       return;\r
-\r
-               tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;\r
-               f.height.value = tp.toFixed(0);\r
-               t.updateStyle();\r
-       },\r
-\r
-       changeWidth : function() {\r
-               var f = document.forms[0], tp, t = this;\r
-\r
-               if (!f.constrain.checked || !t.preloadImg) {\r
-                       t.updateStyle();\r
-                       return;\r
-               }\r
-\r
-               if (f.width.value == "" || f.height.value == "")\r
-                       return;\r
-\r
-               tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;\r
-               f.width.value = tp.toFixed(0);\r
-               t.updateStyle();\r
-       },\r
-\r
-       updateStyle : function() {\r
-               var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];\r
-\r
-               if (tinyMCEPopup.editor.settings.inline_styles) {\r
-                       st = tinyMCEPopup.dom.parseStyle(dom.get('style').value);\r
-\r
-                       // Handle align\r
-                       v = getSelectValue(f, 'align');\r
-                       if (v) {\r
-                               if (v == 'left' || v == 'right') {\r
-                                       st['float'] = v;\r
-                                       delete st['vertical-align'];\r
-                               } else {\r
-                                       st['vertical-align'] = v;\r
-                                       delete st['float'];\r
-                               }\r
-                       } else {\r
-                               delete st['float'];\r
-                               delete st['vertical-align'];\r
-                       }\r
-\r
-                       // Handle border\r
-                       v = f.border.value;\r
-                       if (v || v == '0') {\r
-                               if (v == '0')\r
-                                       st['border'] = '0';\r
-                               else\r
-                                       st['border'] = v + 'px solid black';\r
-                       } else\r
-                               delete st['border'];\r
-\r
-                       // Handle hspace\r
-                       v = f.hspace.value;\r
-                       if (v) {\r
-                               delete st['margin'];\r
-                               st['margin-left'] = v + 'px';\r
-                               st['margin-right'] = v + 'px';\r
-                       } else {\r
-                               delete st['margin-left'];\r
-                               delete st['margin-right'];\r
-                       }\r
-\r
-                       // Handle vspace\r
-                       v = f.vspace.value;\r
-                       if (v) {\r
-                               delete st['margin'];\r
-                               st['margin-top'] = v + 'px';\r
-                               st['margin-bottom'] = v + 'px';\r
-                       } else {\r
-                               delete st['margin-top'];\r
-                               delete st['margin-bottom'];\r
-                       }\r
-\r
-                       // Merge\r
-                       st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st));\r
-                       dom.get('style').value = dom.serializeStyle(st);\r
-               }\r
-       },\r
-\r
-       changeMouseMove : function() {\r
-       },\r
-\r
-       showPreviewImage : function(u, st) {\r
-               if (!u) {\r
-                       tinyMCEPopup.dom.setHTML('prev', '');\r
-                       return;\r
-               }\r
-\r
-               if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))\r
-                       this.resetImageData();\r
-\r
-               u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);\r
-\r
-               if (!st)\r
-                       tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');\r
-               else\r
-                       tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');\r
-       }\r
-};\r
-\r
-ImageDialog.preInit();\r
-tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);\r
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/moodleimage.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/js/moodleimage.js
deleted file mode 100644 (file)
index 03b1d2c..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-tinyMCEPopup.requireLangPack();\r
-\r
-var MoodleImageDialog = {\r
-               init : function(ed) {\r
-               var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();\r
-               course_id = tinyMCEPopup.getParam('moodleimage_course_id');\r
-               tinyMCEPopup.resizeToInnerSize();\r
-               if (n.nodeName == 'IMG') {\r
-                       nl.f_url.value = dom.getAttrib(n, 'src');\r
-                       nl.f_width.value = dom.getAttrib(n, 'width');\r
-                       nl.f_height.value = dom.getAttrib(n, 'height');\r
-                       nl.f_alt.value = dom.getAttrib(n, 'alt');\r
-                       nl.f_vert.value = this.getAttrib(n, 'vspace');\r
-                       nl.f_horiz.value = this.getAttrib(n, 'hspace');\r
-                       nl.f_border.value = this.getAttrib(n, 'border');\r
-                       selectByValue(f, 'f_align', this.getAttrib(n, 'align'));\r
-                       window.ipreview.location.replace('preview.php?id='+ course_id +'&imageurl='+ nl.f_url.value);\r
-               }\r
-               \r
-       },\r
-\r
-       insert : function(file, title) {\r
-               var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];\r
-\r
-               if (f.f_url.value === '') {\r
-                       ed.dom.remove(ed.selection.getNode());\r
-                       ed.execCommand('mceRepaint');\r
-                       tinyMCEPopup.close();\r
-                       return;\r
-               }\r
-\r
-               if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {\r
-                       if (!f.f_alt.value) {\r
-                               tinyMCEPopup.editor.windowManager.confirm(tinyMCEPopup.getLang('moodleimage_dlg.missing_alt'), function(s) {\r
-                                       if (s)\r
-                                               t.insertAndClose();\r
-                               });\r
-\r
-                               return;\r
-                       }\r
-               }\r
-\r
-               t.insertAndClose();\r
-       },\r
-\r
-       insertAndClose : function() {\r
-               var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;\r
-\r
-               // Fixes crash in Safari\r
-               if (tinymce.isWebKit)\r
-                       ed.getWin().focus();\r
-\r
-               tinymce.extend(args, {\r
-                       src : nl.f_url.value,\r
-                       width : nl.f_width.value,\r
-                       height : nl.f_height.value,\r
-                       alt : nl.f_alt.value,\r
-                       vspace : nl.f_vert.value,\r
-                   hspace : nl.f_horiz.value,\r
-                       border : nl.f_border.value,\r
-                       align : getSelectValue(f, 'f_align')\r
-               });\r
-\r
-               el = ed.selection.getNode();\r
-\r
-               if (el && el.nodeName == 'IMG') {\r
-                       ed.dom.setAttribs(el, args);\r
-               } else {\r
-                       ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" src="javascript:;" />');\r
-                       ed.dom.setAttribs('__mce_tmp', args);\r
-                       ed.dom.setAttrib('__mce_tmp', 'id', '');\r
-               }\r
-\r
-               tinyMCEPopup.close();\r
-       }, \r
-\r
-       changeHeight : function() {\r
-               var f = document.forms[0], tp, t = this;\r
-\r
-               //if (!f.constrain.checked || !t.preloadImg) {\r
-                       //t.updateStyle();\r
-                       //return;\r
-               //}\r
-\r
-               if (f.width.value == "" || f.height.value == "")\r
-                       return;\r
-\r
-               tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;\r
-               f.height.value = tp.toFixed(0);\r
-               //t.updateStyle();\r
-       },\r
-\r
-       changeWidth : function() {\r
-               var f = document.forms[0], tp, t = this;\r
-\r
-               //if (!f.constrain.checked || !t.preloadImg) {\r
-                       //t.updateStyle();\r
-                       //return;\r
-               //}\r
-\r
-               if (f.f_width.value == "" || f.f_height.value == "")\r
-                       return;\r
-\r
-               tp = (parseInt(f.f_height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;\r
-               f.width.value = tp.toFixed(0);\r
-               //t.updateStyle();\r
-       },\r
-       getAttrib : function(e, at) {\r
-               var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;\r
-\r
-               if (ed.settings.inline_styles) {\r
-                       switch (at) {\r
-                               case 'align':\r
-                                       if (v = dom.getStyle(e, 'float'))\r
-                                               return v;\r
-\r
-                                       if (v = dom.getStyle(e, 'vertical-align'))\r
-                                               return v;\r
-\r
-                                       break;\r
-\r
-                               case 'hspace':\r
-                                       v = dom.getStyle(e, 'margin-left')\r
-                                       v2 = dom.getStyle(e, 'margin-right');\r
-                                       if (v && v == v2)\r
-                                               return parseInt(v.replace(/[^0-9]/g, ''));\r
-\r
-                                       break;\r
-\r
-                               case 'vspace':\r
-                                       v = dom.getStyle(e, 'margin-top')\r
-                                       v2 = dom.getStyle(e, 'margin-bottom');\r
-                                       if (v && v == v2)\r
-                                               return parseInt(v.replace(/[^0-9]/g, ''));\r
-\r
-                                       break;\r
-\r
-                               case 'border':\r
-                                       v = 0;\r
-\r
-                                       tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {\r
-                                               sv = dom.getStyle(e, 'border-' + sv + '-width');\r
-\r
-                                               // False or not the same as prev\r
-                                               if (!sv || (sv != v && v !== 0)) {\r
-                                                       v = 0;\r
-                                                       return false;\r
-                                               }\r
-\r
-                                               if (sv)\r
-                                                       v = sv;\r
-                                       });\r
-\r
-                                       if (v)\r
-                                               return parseInt(v.replace(/[^0-9]/g, ''));\r
-\r
-                                       break;\r
-                       }\r
-               }\r
-\r
-               if (v = dom.getAttrib(e, at))\r
-                       return v;\r
-\r
-               return '';\r
-       }\r
-\r
-       \r
-};\r
-\r
-\r
-tinyMCEPopup.onInit.add(MoodleImageDialog.init, MoodleImageDialog);\r
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/langs/en_dlg.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/langs/en_dlg.js
deleted file mode 100644 (file)
index 4627138..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-tinyMCE.addI18n('en.moodleimage_dlg',{\r
-title:"Insert Image",\r
-missing_alt:"Are you sure you want to continue without including an Alternate Text? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off."\r
-});
\ No newline at end of file
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/preview.php b/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodleimage/preview.php
deleted file mode 100644 (file)
index 223d9e4..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php // $Id$ preview for insert image dialog\r
-\r
-    require("../../../../../../../config.php");\r
-\r
-    $id = optional_param('id', SITEID, PARAM_INT);\r
-    $imageurl = required_param('imageurl', PARAM_RAW);\r
-\r
-    require_login($id);\r
-    require_capability('moodle/course:managefiles', get_context_instance(CONTEXT_COURSE, $id));\r
-\r
-    @header('Content-Type: text/html; charset=utf-8');\r
-\r
-\r
-    $imagetag = clean_text('<img src="'.htmlSpecialChars($imageurl).'" alt="" />');\r
-\r
-?>\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"\r
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html>\r
-<head>\r
-<title><?php echo get_string('preview') ?></title>\r
-<style type="text/css">\r
- body { margin: 2px; }\r
-</style>\r
-</head>\r
-<body bgcolor="#ffffff">\r
-\r
-<?php echo $imagetag ?>\r
-\r
-</body>\r
-</html>\r