Changeset 613

Timestamp:

04/28/09 21:29:09 (3 years ago)

Author:

jf.hovinne

Message:

Fixed #167.

Location:

trunk/src

Files:

• test/resizable.html (modified) (1 diff)
• wymeditor/plugins/resizable/jquery.wymeditor.resizable.js (modified) (4 diffs)

trunk/src/test/resizable.html

@@ -22 +22 @@
 <title>WYMeditor</title>
 <script type="text/javascript" src="../jquery/jquery.js"></script>
+<script type="text/javascript" src="../jquery/jquery.ui.js"></script>
+<script type="text/javascript" src="../jquery/jquery.ui.resizable.js"></script>
 <script type="text/javascript" src="../wymeditor/jquery.wymeditor.js"></script>
 <script type="text/javascript" src="../wymeditor/jquery.wymeditor.explorer.js"></script>

trunk/src/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js

@@ -1 +1 @@
 /*
  * WYMeditor : what you see is What You Mean web-based editor
- * Copyright (c) 2008 Jean-Francois Hovinne, http://www.wymeditor.org/
+ * Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
  * Dual licensed under the MIT (MIT-license.txt)
  * and GPL (GPL-license.txt) licenses.
@@ -14 +14 @@
  * File Authors:
  *        Peter Eschler (peschler _at_ gmail.com)
+ *        Jean-Francois Hovinne - http://www.hovinne.com/
  *
  * Version:
- *        0.3
+ *        0.4
  *
  * Changelog:
+ *
+ * 0.4
+ *     - Removed UI and UI.resizable scripts loading - see #167 (jfh).
  *
  * 0.3
@@ -39 +43 @@
  *         wym.resizable({ handles: "s,e",
  *                         maxHeight: 600 });
+ *
+ * DEPENDENCIES: jQuery UI, jQuery UI resizable
  *
  * @param options options for the plugin  
@@ -80 +86 @@
     var final_options = jQuery.extend(default_options, options);
 
-    // Get the jQuery path from the editor, stripping away the jQuery file.
-    // see http://www.oreilly.com/catalog/regex/chapter/ch04.html
-    // The match result array contains the path and the filename.
-    var jQueryPath = wym.computeJqueryPath().match(/^(.*)\/(.*)$/)[1];
-
-    // Make an array of the external JavaScript files required by the plugin.
-    var jQueryPlugins = [jQueryPath + '/jquery.ui.js',
-                         jQueryPath + '/jquery.ui.resizable.js'];
-    
-    // First get the jQuery UI base file
-    jQuery.getScript(jQueryPlugins[0]);
-
-    // Get the jQuery UI resizeable plugin and then init the wymeditor resize
-    // plugin. It is import to do the initialisation after loading the    
-    // necessary jQuery UI files has finished, otherwise the "resizable" method
-    // would not be available.
-    jQuery.getScript(jQueryPlugins[1], function() {     
-        jQuery(wym._box).resizable(final_options);
-    });
+    if(jQuery.isFunction( jQuery.fn.resizable )) jQuery(wym._box).resizable(final_options);
 
 };