Permalink
Browse files

merged unified ui with master

  • Loading branch information...
2 parents 35bdf3d + 0fce88c commit 750fa671c3e5a14ef1ccba18aaa7317566cc1bc4 @alecgorge alecgorge committed May 23, 2011
Showing with 2,585 additions and 395 deletions.
  1. +52 −14 CHANGES → CHANGES.markdown
  2. +13 −6 README.rst
  3. +34 −20 controls/wysiwyg.colorpicker.js
  4. +134 −0 controls/wysiwyg.cssWrap.js
  5. +57 −56 controls/wysiwyg.image.js
  6. +7 −1 controls/wysiwyg.link.js
  7. +2 −1 controls/wysiwyg.table.js
  8. +12 −17 help/bin/compile.bash
  9. +2 −0 help/examples/11-plugins.html
  10. +1 −0 help/htmlentity/.gitignore
  11. +4 −0 help/htmlentity/Gemfile
  12. +254 −0 help/htmlentity/db.csv
  13. +50 −0 help/htmlentity/unicode4jwysiwyg.pl
  14. +53 −0 help/htmlentity/unicode4jwysiwyg.rb
  15. +5 −3 help/lib/jquery.js
  16. +193 −135 help/lib/ui/jquery.ui.dialog.js
  17. +10 −0 help/tests/css/issue145.css
  18. +0 −8 help/tests/issue005.html
  19. +106 −0 help/tests/issue145.html
  20. +43 −0 help/tests/issue152.xhtml
  21. +51 −0 help/tests/issue152_iframe.html
  22. +23 −0 help/tests/jasmine/159.spec.js
  23. +25 −0 help/tests/jasmine/controls/html.spec.js
  24. +43 −0 help/tests/jasmine/functions/insertHtml.spec.js
  25. +50 −0 help/tests/jasmine/plugins/i18n.spec.js
  26. +30 −0 help/tests/jasmine/plugins/rmFormat.spec.js
  27. +10 −0 help/tests/run-jasmine-tests.html
  28. +94 −0 i18n/lang.he.js
  29. +98 −0 i18n/lang.hr.js
  30. +93 −0 i18n/lang.zh-cn.js
  31. +11 −3 jquery.wysiwyg.css
  32. BIN jquery.wysiwyg.gif
  33. +171 −38 jquery.wysiwyg.js
  34. BIN jquery.wysiwyg.no-alpha.gif
  35. +4 −2 jquery.wysiwyg.old-school.css
  36. +79 −0 plugins/fileManager/handlers/Perl/file_manager.pl
  37. +50 −0 plugins/fileManager/handlers/Perl/mkdir_handler.pl
  38. +37 −0 plugins/fileManager/handlers/Perl/move_handler.pl
  39. +61 −0 plugins/fileManager/handlers/Perl/remove_handler.pl
  40. +58 −0 plugins/fileManager/handlers/Perl/rename_handler.pl
  41. +68 −0 plugins/fileManager/handlers/Perl/upload_handler.pl
  42. BIN plugins/fileManager/images/mkdir.png
  43. BIN plugins/fileManager/images/remove.png
  44. BIN plugins/fileManager/images/rename.png
  45. BIN plugins/fileManager/images/upload.png
  46. +24 −4 plugins/fileManager/wysiwyg.fileManager.css
  47. +461 −72 plugins/wysiwyg.fileManager.js
  48. +9 −15 plugins/wysiwyg.i18n.js
  49. +3 −0 plugins/wysiwyg.rmFormat.js
@@ -1,11 +1,48 @@
-== master (not tagged yet) ==
-
+# Changes
+
+## master (not tagged yet)
+
+## Version 0.97.2 (From infinity)
+
+* Preparing to jQuery 1.6 - akzhan
+* Fixed infinite loops - frost-nzcr4
+* rmFormat a bit improved - frost-nzcr4
+* Fixed issue in Firefox when insertHtml is used - frost-nzcr4
+* Useless disabled attribute on LI tags has been removed, disabled class added instead of - akzhan
+
+## Version 0.97.1 (Follow me)
+
+Take a note that version number in jquery.wysiwyg.js is not changed to make Drupal users happy.
+Also I want to note that 0.97.1 supports ECMAScript strict mode.
+
+* jslint (fixes for common asset compressors) - filiptepper
+* Fix paste issues for Microsoft Word formatter - frost-nzcr4
+
+## Version 0.97 (Next step)
+
+* Bugfixes and core enhancements - frost-nzcr4
+* jslint - frost-nzcr4, akzhan
+* Documentation - vjt, ctide, afilina, elektronaut
+* Controls: increase/decrease font size, highlight, code - vjt, ctide, Tudmotu
+* Sorting controls by user - vjt
+* New options: initialMinHeight and maxLength - ctide
+* Enhance modal dialogs - ctide
+* New API method selectAll - ctide
+* Fix dialog in image control - simsalabim
+* CSS fixes - Jason Orrill, afilina
+* Switch to Uglify compressor - akzhan
+* Add Jasmine test suite - frost-nzcr4
+* Dev tools to generate unicode entities - EvanCarroll, akzhan
+* Enhance event handler - brentkirby
+* Fixed bugs in event system - EvanCarroll
+* Editor specific event system - alecgorge
+* XHTML5 and Unicode Entity Handling - EvanCarroll, alecgorge
* Dutch locale for jwysiwyg - Erik van Dongen
* Polish locale for jwysiwyg - aherok
-== Version 0.96 (Pretty girl)
+## Version 0.96 (Pretty girl)
-* Plugin rmFormat: fix for Word & IE markup - SugaSlide
+* Plugin rmFormat: fix for Word and IE markup - SugaSlide
* Proper dialog focus with IE7/8 - frost-nczr4, academo
* Closure for autoSaveFunction - mbj
* New options - mbj, frost-nczr4
@@ -22,7 +59,7 @@
* Spanish locale for jwysiwyg - academo
* Ability to translate dialogs - frost-nczr4
-== Version 0.95 (Kino)
+## Version 0.95 (Kino)
* Directory structure of repository has been reorganized to be more friendly for Drupal users - frost-nzcr4, sun
* Plugins API implemented - frost-nzcr4
@@ -45,7 +82,7 @@
* Swedish locale for jwysiwyg - ippa
* Russian locale for jwysiwyg - frost-nzcr4
-== Version 0.94 (phase 2) ==
+## Version 0.94 (phase 2)
* focus is properly returned after clicking on buttons - alecgorge
* fix for getContent operation by class selector - alecgorge
@@ -59,7 +96,7 @@
* Use Cmd key on Macs - boutell
* JSlint fixes - akzhan, filiptepper
-== Version 0.93 (koken) ==
+## Version 0.93 (koken)
* Hide wysiwyg while html shown - akzhan
* jwysiwyg destroy fixed - jalada
@@ -69,47 +106,47 @@
* Iframe now can use class name to be styled - chris.haumesser
* Version string in source file must ended with version number for Drupal integration folks - xeto
-== Version 0.92 (arigatou gozaimasu)
+## Version 0.92 (arigatou gozaimasu)
* Fix work under quirks mode of Internet Explorer - kris.schwab
* Workaround for Mozilla/WebKit misfunctionality of RemoveFormat over headings - aiveldesign
* Experimental support for switching between LTR/RTL modes (no icons provided and markup issues) - abduljawad.mahmoud
* More robust selection check in createLink - systeembeheer
-== Version 0.91 (maintenance release)
+## Version 0.91 (maintenance release)
* Editor now throw errors on unknown actions - akzhan
* Getter methods were broken. Fixed - wordituk
* headings formatting has been fixed in IE, Firefox and Chrome - kolpak
-== Version 0.9 (maintenance release)
+## Version 0.9 (maintenance release)
* Buttons are unselectable now and have no anchors (CSS reviewed) - mrapczynski
* Way to return focus to editor has been corrected - mappam0
* $.fn.documentSelection has been removed to minimize pollution of $.fn namespace - akzhan
* Source mode fixed for all browsers (was inspired by 0.8) - silvermuru
-== Version 0.8 (revival) ==
+## Version 0.8 (revival)
+ enabled, destroy, removeFormat, save actions added to $('#elt').wysiwyg(action) - fomojola
+ insertTable action/button added - academo
+ insertTable and insertImage buttons now support jQuery UI Dialog and SimpleModal plugin - academo
+ Event handlers supported through events - akzhan
+ Editor now supports jQuery UI resizable plugin through resizeOptions - akzhan
* jWysiwyg now wraps Mozilla bug that disables editor creation in AJAX calls - akzhan
-* MSG_EN abd TOOLBAR replaced with $.fn.wysiwyg.defaults/controls - akzhan
+* *MSG_EN* and *TOOLBAR* replaced with $.fn.wysiwyg.defaults/controls - akzhan
* separators replaced with group indexes - akzhan
* Directory structure reorganized - academo
* $.fn.document has been removed to minimize pollution of $.fn namespace - akzhan
-== Version 0.7 ==
+## Version 0.7
* Ctrl+B, Ctrl+I and Ctrl+U keystrokes in non-IE browsers now works like IE ones - akzhan
* insertHtml in non-focused editor works now - akzhan
* Appearance of toolbar buttons fixed under IE7/8 - ibnteo, mail2lx
! Code reviewed.
-== Version 0.6 ==
+## Version 0.6
* New $().wysiwyg('insertHtml', string) method - akzhan
* New example (nearby full editor) added - deansofer
@@ -124,3 +161,4 @@
* Improved CSS degradability - deansofer
* Improved ARIA accessability - akzhan
! Requires jQuery 1.3 or higher! Tested under jQuery 1.4 too.
+
View
@@ -1,8 +1,9 @@
=========================
-jWYSIWYG 0.96 User Manual
+jWYSIWYG 0.97 User Manual
=========================
-Copyright (c) 2009-2010 Juan M Martínez
+Copyright (c) 2009-2010 Juan M Martínez, 2011 Akzhan Abdulin and all contributors
+
Dual licensed under the `MIT
<http://github.com/akzhan/jwysiwyg/raw/master/MIT-LICENSE.txt>`_ and `GPL
<http://github.com/akzhan/jwysiwyg/raw/master/GPL-LICENSE.txt>`_ licenses.
@@ -13,7 +14,9 @@ Dual licensed under the `MIT
Requires
========
-jQuery 1.3.2 or higher (tested with jQuery 1.5.1).
+jQuery 1.3.2 or higher (tested with jQuery 1.5.2).
+
+Note that we do not support officially jQuery 1.6, but will support jQuery 1.6.1.
========
Supports
@@ -232,6 +235,10 @@ the wysiwyg() function when it is first called on a textarea. Available keys are
``rmFormat``
``rmMsWordMarkup``
A bool. If true then remove MS Word markup is used
+
+ .. note::
+ To run rmFormat by clicking on remove format control or using triggerControl
+ you also should set $.wysiwyg.rmFormat.enabled = true before they being used
``toolbarHtml``
A string containing the source HTML code
@@ -424,14 +431,14 @@ Built-in editor functions can be triggered manually with the
Include file wysiwyg.table.js to provide this function
* removeFormat
-* save
+* save - save changes from editor to related textarea
* selectAll
* setContent
-For example, if you want to save the content to original textarea, and then
+For example, if you want to set new content to original textarea, and then
remove the jWYSIWYG editor to bring original textarea back::
- $("#original").wysiwyg("save").wysiwyg("destroy")
+ $("#original").wysiwyg("setContent", "<p>My new content</p>").wysiwyg("destroy")
====================================
Customizing the Editor Look and Feel
@@ -48,25 +48,35 @@
} else {
$.wysiwyg.controls.colorpicker.modalOpen = true;
}
- var self = this, elements, dialog, colorpickerHtml,
- formTextLegend = "Colorpicker",
- formTextColor = "Color",
- formTextSubmit = "Apply",
- formTextReset = "Cancel";
-
- if ($.wysiwyg.i18n) {
- formTextLegend = $.wysiwyg.i18n.t(formTextLegend, "dialogs.colorpicker");
- formTextColor = $.wysiwyg.i18n.t(formTextColor, "dialogs.colorpicker");
- formTextSubmit = $.wysiwyg.i18n.t(formTextSubmit, "dialogs");
- formTextReset = $.wysiwyg.i18n.t(formTextReset, "dialogs");
- }
+ var self = this, elements, dialog, colorpickerHtml, dialogReplacements, key, translation;
+
+ dialogReplacements = {
+ legend: "Colorpicker",
+ color: "Color",
+ submit: "Apply",
+ reset: "Cancel"
+ };
- colorpickerHtml = '<form class="wysiwyg"><fieldset><legend>' + formTextLegend + '</legend>' +
+ colorpickerHtml = '<form class="wysiwyg"><fieldset><legend>{legend}</legend>' +
'<ul class="palette"></ul>' +
- '<label>' + formTextColor + ': <input type="text" name="color" value="#123456"/></label>' +
+ '<label>{color}: <input type="text" name="color" value="#123456"/></label>' +
'<div class="wheel"></div>' +
- '<input type="submit" class="button" value="' + formTextSubmit + '"/> ' +
- '<input type="reset" value="' + formTextReset + '"/></fieldset></form>';
+ '<input type="submit" class="button" value="{submit}"/> ' +
+ '<input type="reset" value="{reset}"/></fieldset></form>';
+
+ for (key in dialogReplacements) {
+ if ($.wysiwyg.i18n) {
+ translation = $.wysiwyg.i18n.t(dialogReplacements[key], "dialogs.colorpicker");
+
+ if (translation === dialogReplacements[key]) { // if not translated search in dialogs
+ translation = $.wysiwyg.i18n.t(dialogReplacements[key], "dialogs");
+ }
+
+ dialogReplacements[key] = translation;
+ }
+
+ colorpickerHtml = colorpickerHtml.replace("{" + key + "}", dialogReplacements[key]);
+ }
if ($.modal) {
elements = $(colorpickerHtml);
@@ -77,6 +87,10 @@
}
$.modal(elements.html(), {
+ maxWidth: Wysiwyg.defaults.formWidth,
+ maxHeight: Wysiwyg.defaults.formHeight,
+ overlayClose: true,
+
onShow: function (dialog) {
$("input:submit", dialog.data).click(function (e) {
var color = $('input[name="color"]', dialog.data).val();
@@ -103,13 +117,11 @@
e.stopPropagation();
});
},
+
onClose: function (dialog) {
$.wysiwyg.controls.colorpicker.modalOpen = false;
$.modal.close();
- },
- maxWidth: Wysiwyg.defaults.formWidth,
- maxHeight: Wysiwyg.defaults.formHeight,
- overlayClose: true
+ }
});
} else if ($.fn.dialog) {
elements = $(colorpickerHtml);
@@ -122,6 +134,7 @@
dialog = elements.appendTo("body");
dialog.dialog({
modal: true,
+
open: function (event, ui) {
$("input:submit", elements).click(function (e) {
var color = $('input[name="color"]', dialog).val();
@@ -148,6 +161,7 @@
e.stopPropagation();
});
},
+
close: function (event, ui) {
$.wysiwyg.controls.colorpicker.modalOpen = false;
dialog.dialog("destroy");
Oops, something went wrong.

0 comments on commit 750fa67

Please sign in to comment.