typo 5.0.3.98.1 → 5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGES-5.1 +54 -0
- data/app/apis/meta_weblog_service.rb +7 -6
- data/app/controllers/accounts_controller.rb +2 -1
- data/app/controllers/admin/content_controller.rb +45 -3
- data/app/controllers/admin/pages_controller.rb +1 -1
- data/app/controllers/admin/textfilters_controller.rb +4 -4
- data/app/controllers/admin/users_controller.rb +14 -2
- data/app/controllers/application.rb +4 -1
- data/app/controllers/articles_controller.rb +1 -3
- data/app/controllers/backend_controller.rb +2 -0
- data/app/controllers/comments_controller.rb +6 -0
- data/app/helpers/admin/base_helper.rb +24 -26
- data/app/helpers/admin/feedback_helper.rb +0 -20
- data/app/helpers/application_helper.rb +1 -0
- data/app/models/article.rb +2 -0
- data/app/models/blog.rb +1 -0
- data/app/models/blog_sweeper.rb +8 -9
- data/app/models/page_cache.rb +1 -0
- data/app/models/tag.rb +2 -2
- data/app/models/user.rb +5 -1
- data/app/views/admin/blacklist/destroy.html.erb +1 -1
- data/app/views/admin/categories/destroy.html.erb +1 -1
- data/app/views/admin/comments/destroy.html.erb +1 -1
- data/app/views/admin/content/_articles.html.erb +4 -4
- data/app/views/admin/content/_attachment.html.erb +6 -7
- data/app/views/admin/content/_drafts.html.erb +6 -0
- data/app/views/admin/content/_form.html.erb +47 -34
- data/app/views/admin/content/destroy.html.erb +1 -1
- data/app/views/admin/content/edit.html.erb +1 -1
- data/app/views/admin/content/index.html.erb +1 -6
- data/app/views/admin/content/new.html.erb +1 -1
- data/app/views/admin/pages/_form.html.erb +4 -3
- data/app/views/admin/pages/_pages.html.erb +3 -3
- data/app/views/admin/pages/destroy.html.erb +1 -1
- data/app/views/admin/resources/destroy.html.erb +1 -1
- data/app/views/admin/settings/index.html.erb +10 -0
- data/app/views/admin/shared/_edit.html.erb +1 -6
- data/app/views/admin/textfilters/destroy.html.erb +3 -0
- data/app/views/admin/textfilters/edit.html.erb +3 -1
- data/app/views/admin/textfilters/index.html.erb +1 -1
- data/app/views/admin/textfilters/new.html.erb +3 -1
- data/app/views/admin/trackbacks/show.html.erb +1 -1
- data/app/views/admin/users/destroy.html.erb +1 -1
- data/app/views/admin/users/edit.html.erb +1 -5
- data/app/views/admin/users/index.html.erb +1 -1
- data/app/views/articles/_comment_failed.html.erb +3 -0
- data/config/initializers/access_rules.rb +3 -3
- data/db/migrate/070_add_users_to_non_admins.rb +17 -0
- data/installer/rails_installer_defaults.yml +1 -1
- data/lib/tasks/release.rake +3 -3
- data/lib/typo_version.rb +1 -1
- data/public/images/admin/cancel.png +0 -0
- data/public/images/admin/checked.png +0 -0
- data/public/images/admin/delete.png +0 -0
- data/public/images/admin/edit.png +0 -0
- data/public/images/admin/show.png +0 -0
- data/public/javascripts/controls.js +2 -0
- data/public/javascripts/dragdrop.js +2 -0
- data/public/javascripts/effects.js +6 -4
- data/public/javascripts/fckeditor/editor/_source/classes/fckcontextmenu.js +13 -8
- data/public/javascripts/fckeditor/editor/_source/classes/fckdataprocessor.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange.js +189 -79
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_gecko.js +4 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrange_ie.js +16 -15
- data/public/javascripts/fckeditor/editor/_source/classes/fckdomrangeiterator.js +30 -9
- data/public/javascripts/fckeditor/editor/_source/classes/fckeditingarea.js +108 -90
- data/public/javascripts/fckeditor/editor/_source/classes/fckelementpath.js +22 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckenterkey.js +76 -38
- data/public/javascripts/fckeditor/editor/_source/classes/fckevents.js +7 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckhtmliterator.js +142 -0
- data/public/javascripts/fckeditor/editor/_source/classes/fckicon.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckiecleanup.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fckimagepreloader.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckkeystrokehandler.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenublock.js +8 -5
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenublockpanel.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fckmenuitem.js +6 -5
- data/public/javascripts/fckeditor/editor/_source/classes/fckpanel.js +85 -38
- data/public/javascripts/fckeditor/editor/_source/classes/fckplugin.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckspecialcombo.js +7 -8
- data/public/javascripts/fckeditor/editor/_source/classes/fckstyle.js +180 -17
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbar.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbutton.js +9 -4
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js +5 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js +15 -4
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js +5 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js +13 -13
- data/public/javascripts/fckeditor/editor/_source/classes/fckw3crange.js +17 -13
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml_gecko.js +28 -13
- data/public/javascripts/fckeditor/editor/_source/classes/fckxml_ie.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fck_othercommands.js +75 -19
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js +64 -8
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js +3 -1
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckfitwindow.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckindentcommands.js +5 -3
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckjustifycommands.js +6 -6
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcklistcommands.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcknamedcommand.js +3 -1
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js +3 -1
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckshowblocks.js +7 -9
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js +4 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js +4 -2
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fckstylecommand.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktablecommand.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js +28 -10
- data/public/javascripts/fckeditor/editor/_source/fckconstants.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/fckeditorapi.js +21 -13
- data/public/javascripts/fckeditor/editor/_source/fckjscoreextensions.js +5 -5
- data/public/javascripts/fckeditor/editor/_source/fckscriptloader.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/internals/fck.js +148 -38
- data/public/javascripts/fckeditor/editor/_source/internals/fck_contextmenu.js +4 -4
- data/public/javascripts/fckeditor/editor/_source/internals/fck_gecko.js +45 -47
- data/public/javascripts/fckeditor/editor/_source/internals/fck_ie.js +50 -17
- data/public/javascripts/fckeditor/editor/_source/internals/fckbrowserinfo.js +4 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckcodeformatter.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckcommands.js +28 -28
- data/public/javascripts/fckeditor/editor/_source/internals/fckconfig.js +12 -13
- data/public/javascripts/fckeditor/editor/_source/internals/fckdebug.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckdialog.js +211 -15
- data/public/javascripts/fckeditor/editor/_source/internals/fckdocumentprocessor.js +63 -39
- data/public/javascripts/fckeditor/editor/_source/internals/fckdomtools.js +177 -37
- data/public/javascripts/fckeditor/editor/_source/internals/fcklanguagemanager.js +2 -1
- data/public/javascripts/fckeditor/editor/_source/internals/fcklisthandler.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fcklistslib.js +5 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckplugins.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckregexlib.js +5 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection.js +3 -3
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection_gecko.js +36 -27
- data/public/javascripts/fckeditor/editor/_source/internals/fckselection_ie.js +91 -17
- data/public/javascripts/fckeditor/editor/_source/internals/fckstyles.js +22 -13
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler.js +15 -15
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_gecko.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fcktablehandler_ie.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbaritems.js +1 -1
- data/public/javascripts/fckeditor/editor/_source/internals/fcktoolbarset.js +32 -6
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools.js +181 -22
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools_gecko.js +19 -7
- data/public/javascripts/fckeditor/editor/_source/internals/fcktools_ie.js +8 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckundo.js +8 -5
- data/public/javascripts/fckeditor/editor/_source/internals/fckurlparams.js +2 -2
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml.js +116 -61
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_gecko.js +6 -10
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtml_ie.js +51 -56
- data/public/javascripts/fckeditor/editor/_source/internals/fckxhtmlentities.js +1 -1
- data/public/javascripts/fckeditor/editor/css/fck_editorarea.css +3 -2
- data/public/javascripts/fckeditor/editor/css/fck_internal.css +19 -2
- data/public/javascripts/fckeditor/editor/css/fck_showtableborders_gecko.css +8 -1
- data/public/javascripts/fckeditor/editor/css/images/fck_plugin.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.css +8 -1
- data/public/javascripts/fckeditor/editor/dialog/common/fck_dialog_common.js +199 -26
- data/public/javascripts/fckeditor/editor/dialog/fck_about.html +20 -14
- data/public/javascripts/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif +0 -0
- data/public/javascripts/fckeditor/editor/dialog/fck_anchor.html +15 -10
- data/public/javascripts/fckeditor/editor/dialog/fck_button.html +9 -14
- data/public/javascripts/fckeditor/editor/dialog/fck_checkbox.html +8 -13
- data/public/javascripts/fckeditor/editor/dialog/fck_colorselector.html +4 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_docprops.html +6 -6
- data/public/javascripts/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_flash.html +9 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash.js +18 -11
- data/public/javascripts/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html +7 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_form.html +7 -4
- data/public/javascripts/fckeditor/editor/dialog/fck_hiddenfield.html +12 -15
- data/public/javascripts/fckeditor/editor/dialog/fck_image.html +9 -3
- data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image.js +24 -12
- data/public/javascripts/fckeditor/editor/dialog/fck_image/fck_image_preview.html +24 -18
- data/public/javascripts/fckeditor/editor/dialog/fck_link.html +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_link/fck_link.js +41 -20
- data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html +8 -4
- data/public/javascripts/fckeditor/editor/dialog/fck_paste.html +53 -54
- data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html +8 -13
- data/public/javascripts/fckeditor/editor/dialog/fck_replace.html +157 -79
- data/public/javascripts/fckeditor/editor/dialog/fck_select.html +14 -11
- data/public/javascripts/fckeditor/editor/dialog/fck_select/fck_select.js +2 -2
- data/public/javascripts/fckeditor/editor/dialog/fck_smiley.html +9 -4
- data/public/javascripts/fckeditor/editor/dialog/fck_source.html +5 -2
- data/public/javascripts/fckeditor/editor/dialog/fck_specialchar.html +9 -6
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages.html +2 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm +3 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php +5 -2
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl +2 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js +0 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_table.html +10 -5
- data/public/javascripts/fckeditor/editor/dialog/fck_tablecell.html +8 -6
- data/public/javascripts/fckeditor/editor/dialog/fck_template.html +1 -1
- data/public/javascripts/fckeditor/editor/dialog/fck_textarea.html +10 -11
- data/public/javascripts/fckeditor/editor/dialog/fck_textfield.html +10 -14
- data/public/javascripts/fckeditor/editor/dtd/fck_dtd_test.html +0 -2
- data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10strict.js +2 -2
- data/public/javascripts/fckeditor/editor/dtd/fck_xhtml10transitional.js +3 -3
- data/public/javascripts/fckeditor/editor/fckdebug.html +1 -1
- data/public/javascripts/fckeditor/editor/fckdialog.html +660 -213
- data/public/javascripts/fckeditor/editor/fckeditor.html +66 -16
- data/public/javascripts/fckeditor/editor/fckeditor.original.html +70 -16
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.css +2 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/browser.html +37 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmactualfolder.html +33 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmfolders.html +2 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourceslist.html +3 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmresourcetype.html +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/frmupload.html +2 -1
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/common.js +34 -2
- data/public/javascripts/fckeditor/editor/filemanager/browser/default/js/fckxml.js +3 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/connector.aspx +5 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/aspx/upload.aspx +5 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/basexml.pl +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/commands.pl +50 -4
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/connector.cgi +2 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/io.pl +14 -4
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload.cgi +2 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl +23 -4
- data/public/javascripts/fckeditor/editor/filemanager/connectors/perl/util.pl +1 -1
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/config.py +43 -32
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py +16 -16
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py +26 -9
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py +2 -2
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py +40 -9
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py +20 -21
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt +2 -2
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py +13 -13
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py +3 -3
- data/public/javascripts/fckeditor/editor/filemanager/connectors/py/zope.py +4 -5
- data/public/javascripts/fckeditor/editor/filemanager/connectors/test.html +34 -1
- data/public/javascripts/fckeditor/editor/filemanager/connectors/uploadtest.html +47 -4
- data/public/javascripts/fckeditor/editor/js/fckadobeair.js +176 -0
- data/public/javascripts/fckeditor/editor/js/fckeditorcode_gecko.js +77 -77
- data/public/javascripts/fckeditor/editor/js/fckeditorcode_ie.js +74 -74
- data/public/javascripts/fckeditor/editor/lang/_translationstatus.txt +55 -54
- data/public/javascripts/fckeditor/editor/lang/af.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ar.js +16 -17
- data/public/javascripts/fckeditor/editor/lang/bg.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/bn.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/bs.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ca.js +27 -28
- data/public/javascripts/fckeditor/editor/lang/cs.js +18 -19
- data/public/javascripts/fckeditor/editor/lang/da.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/de.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/el.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en-au.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en-ca.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en-uk.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/en.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/eo.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/es.js +34 -35
- data/public/javascripts/fckeditor/editor/lang/et.js +32 -33
- data/public/javascripts/fckeditor/editor/lang/eu.js +32 -33
- data/public/javascripts/fckeditor/editor/lang/fa.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/fi.js +15 -16
- data/public/javascripts/fckeditor/editor/lang/fo.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/fr-ca.js +515 -0
- data/public/javascripts/fckeditor/editor/lang/fr.js +5 -6
- data/public/javascripts/fckeditor/editor/lang/gl.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/he.js +15 -16
- data/public/javascripts/fckeditor/editor/lang/hi.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/hr.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/hu.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/it.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ja.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/km.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ko.js +25 -26
- data/public/javascripts/fckeditor/editor/lang/lt.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/lv.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/mn.js +199 -200
- data/public/javascripts/fckeditor/editor/lang/ms.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/nb.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/nl.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/no.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/pl.js +51 -52
- data/public/javascripts/fckeditor/editor/lang/pt-br.js +16 -17
- data/public/javascripts/fckeditor/editor/lang/pt.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ro.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/ru.js +31 -32
- data/public/javascripts/fckeditor/editor/lang/sk.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/sl.js +39 -40
- data/public/javascripts/fckeditor/editor/lang/sr-latn.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/sr.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/sv.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/th.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/tr.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/uk.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/vi.js +1 -2
- data/public/javascripts/fckeditor/editor/lang/zh-cn.js +2 -3
- data/public/javascripts/fckeditor/editor/lang/zh.js +1 -2
- data/public/javascripts/fckeditor/editor/plugins/autogrow/fckplugin.js +9 -2
- data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.config.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/bbcode/_sample/sample.html +1 -1
- data/public/javascripts/fckeditor/editor/plugins/bbcode/fckplugin.js +2 -2
- data/public/javascripts/fckeditor/editor/plugins/dragresizetable/fckplugin.js +35 -11
- data/public/javascripts/fckeditor/editor/plugins/placeholder/fck_placeholder.html +10 -5
- data/public/javascripts/fckeditor/editor/plugins/placeholder/fckplugin.js +3 -3
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/de.js +2 -2
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/en.js +2 -2
- data/public/javascripts/fckeditor/editor/{filemanager/connectors/cfm/upload.cfm → plugins/placeholder/lang/es.js} +9 -13
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/fr.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/it.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/placeholder/lang/pl.js +2 -2
- data/public/javascripts/fckeditor/editor/plugins/simplecommands/fckplugin.js +1 -1
- data/public/javascripts/fckeditor/editor/plugins/tablecommands/fckplugin.js +1 -1
- data/public/javascripts/fckeditor/editor/skins/_fckviewstrips.html +1 -1
- data/public/javascripts/fckeditor/editor/skins/default/fck_dialog.css +271 -8
- data/public/javascripts/fckeditor/editor/skins/default/fck_editor.css +2 -2
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_dialog.css +270 -8
- data/public/javascripts/fckeditor/editor/skins/office2003/fck_editor.css +2 -2
- data/public/javascripts/fckeditor/editor/skins/silver/fck_dialog.css +270 -11
- data/public/javascripts/fckeditor/editor/skins/silver/fck_editor.css +2 -2
- data/public/javascripts/fckeditor/fckconfig.js +58 -55
- data/public/javascripts/fckeditor/fckeditor.js +99 -8
- data/public/javascripts/fckeditor/fckeditor.py +2 -4
- data/public/javascripts/fckeditor/fckpackager.xml +12 -12
- data/public/javascripts/fckeditor/fckstyles.xml +2 -5
- data/public/javascripts/fckeditor/fcktemplates.xml +1 -1
- data/public/javascripts/fckeditor/license.txt +1 -2
- data/public/javascripts/prototype.js +46 -101
- data/public/javascripts/scriptaculous.js +28 -17
- data/public/stylesheets/administration.css +5 -1
- data/themes/dirtylicious/about.markdown +3 -0
- data/themes/dirtylicious/images/body.jpg +0 -0
- data/themes/dirtylicious/images/container.jpg +0 -0
- data/themes/dirtylicious/images/gravatar.gif +0 -0
- data/themes/dirtylicious/images/header.jpg +0 -0
- data/themes/dirtylicious/images/li.gif +0 -0
- data/themes/dirtylicious/images/main.gif +0 -0
- data/themes/dirtylicious/images/nav.gif +0 -0
- data/themes/dirtylicious/images/quote.gif +0 -0
- data/themes/dirtylicious/images/spinner.gif +0 -0
- data/themes/dirtylicious/layouts/default.html.erb +60 -0
- data/themes/dirtylicious/preview.png +0 -0
- data/themes/dirtylicious/stylesheets/application.css +327 -0
- data/themes/dirtylicious/views/articles/_article.html.erb +33 -0
- data/themes/dirtylicious/views/articles/_comment.html.erb +14 -0
- data/themes/dirtylicious/views/articles/_comment_form.html.erb +37 -0
- data/themes/dirtylicious/views/articles/_comment_list.html.erb +7 -0
- data/themes/dirtylicious/views/articles/_trackback.html.erb +9 -0
- data/themes/dirtylicious/views/articles/comment_preview.html.erb +10 -0
- data/themes/dirtylicious/views/articles/index.html.erb +5 -0
- data/themes/dirtylicious/views/articles/read.html.erb +42 -0
- data/themes/dirtylicious/views/shared/_search.html.erb +16 -0
- data/themes/standard_issue/about.markdown +5 -0
- data/themes/standard_issue/images/img01.gif +0 -0
- data/themes/standard_issue/images/img02.gif +0 -0
- data/themes/standard_issue/images/img03.gif +0 -0
- data/themes/standard_issue/images/img04.jpg +0 -0
- data/themes/standard_issue/images/img05.gif +0 -0
- data/themes/standard_issue/images/img06.gif +0 -0
- data/themes/standard_issue/images/img07.gif +0 -0
- data/themes/standard_issue/images/img08.gif +0 -0
- data/themes/standard_issue/images/img09.gif +0 -0
- data/themes/standard_issue/images/img10.gif +0 -0
- data/themes/standard_issue/images/spacer.gif +0 -0
- data/themes/standard_issue/images/spinner.gif +0 -0
- data/themes/standard_issue/layouts/default.html.erb +59 -0
- data/themes/standard_issue/preview.png +0 -0
- data/themes/standard_issue/stylesheets/application.css +461 -0
- data/themes/standard_issue/views/articles/_article.html.erb +37 -0
- data/themes/standard_issue/views/articles/_comment.html.erb +12 -0
- data/themes/standard_issue/views/articles/_comment_form.html.erb +48 -0
- data/themes/standard_issue/views/articles/_comment_list.html.erb +7 -0
- data/themes/standard_issue/views/articles/_trackback.html.erb +9 -0
- data/themes/standard_issue/views/articles/comment_preview.html.erb +10 -0
- data/themes/standard_issue/views/articles/index.html.erb +5 -0
- data/themes/standard_issue/views/articles/read.html.erb +42 -0
- data/themes/standard_issue/views/shared/_search.html.erb +17 -0
- data/themes/standard_issue/views/theme/static_view_test.html.erb +1 -0
- data/themes/typographic/images/accept.gif +0 -0
- data/themes/typographic/images/accept50.gif +0 -0
- data/themes/typographic/images/bg_white.gif +0 -0
- data/themes/typographic/images/bg_wrapper.gif +0 -0
- data/themes/typographic/images/bullet_bottom.gif +0 -0
- data/themes/typographic/images/bullet_right.gif +0 -0
- data/themes/typographic/images/email_open.gif +0 -0
- data/themes/typographic/images/email_open50.gif +0 -0
- data/themes/typographic/images/meta.gif +0 -0
- data/themes/typographic/images/page_edit.gif +0 -0
- data/themes/typographic/images/page_edit50.gif +0 -0
- data/themes/typographic/images/spinner.gif +0 -0
- data/themes/typographic/images/tag.gif +0 -0
- data/themes/typographic/images/user.gif +0 -0
- data/themes/typographic/images/user50.gif +0 -0
- data/themes/typographic/images/world_link.gif +0 -0
- data/themes/typographic/images/world_link50.gif +0 -0
- data/themes/typographic/layouts/default.html.erb +5 -2
- data/themes/typographic/stylesheets/ie6.css +86 -0
- data/themes/typographic/views/articles/_article.html.erb +2 -2
- data/vendor/plugins/fckeditor/README +0 -7
- data/vendor/plugins/fckeditor/app/helpers/fckeditor_helper.rb +1 -3
- data/vendor/plugins/fckeditor/lib/fckeditor_version.rb +2 -2
- data/vendor/plugins/fckeditor/tasks/fckeditor_tasks.rake +1 -1
- data/vendor/plugins/fckeditor/test/fckeditor_test.rb +8 -0
- metadata +98 -66
- data/CHANGES-5.0.4 +0 -33
- data/SIDEBARS +0 -39
- data/app/views/admin/content/_quick_post.html.erb +0 -20
- data/db/schema.rb +0 -224
- data/public/.DS_Store +0 -0
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/basexml.asp +0 -62
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/class_upload.asp +0 -353
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/commands.asp +0 -198
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/config.asp +0 -128
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/connector.asp +0 -88
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/io.asp +0 -222
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/upload.asp +0 -61
- data/public/javascripts/fckeditor/editor/filemanager/connectors/asp/util.asp +0 -55
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc +0 -273
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm +0 -315
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm +0 -296
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm +0 -68
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm +0 -225
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm +0 -89
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm +0 -288
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm +0 -68
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm +0 -132
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/config.cfm +0 -183
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/connector.cfm +0 -31
- data/public/javascripts/fckeditor/editor/filemanager/connectors/cfm/image.cfc +0 -1325
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/config.lasso +0 -65
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/connector.lasso +0 -257
- data/public/javascripts/fckeditor/editor/filemanager/connectors/lasso/upload.lasso +0 -157
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/basexml.php +0 -93
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/commands.php +0 -245
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/config.php +0 -140
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/connector.php +0 -87
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/io.php +0 -272
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/phpcompat.php +0 -17
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/upload.php +0 -59
- data/public/javascripts/fckeditor/editor/filemanager/connectors/php/util.php +0 -185
- data/public/javascripts/fckeditor/fckeditor.afp +0 -161
- data/public/javascripts/fckeditor/fckeditor.asp +0 -235
- data/public/javascripts/fckeditor/fckeditor.cfc +0 -273
- data/public/javascripts/fckeditor/fckeditor.cfm +0 -210
- data/public/javascripts/fckeditor/fckeditor.lasso +0 -112
- data/test/mocks/themes/typographic/.DS_Store +0 -0
- data/themes/typographic/.DS_Store +0 -0
- data/vendor/plugins/audioscrobbler_sidebar/MAINTAINERS +0 -26
- data/vendor/plugins/audioscrobbler_sidebar/MIT-LICENSE +0 -21
- data/vendor/plugins/audioscrobbler_sidebar/README +0 -27
- data/vendor/plugins/audioscrobbler_sidebar/Rakefile +0 -22
- data/vendor/plugins/audioscrobbler_sidebar/init.rb +0 -5
- data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler.rb +0 -54
- data/vendor/plugins/audioscrobbler_sidebar/lib/audioscrobbler_sidebar.rb +0 -13
- data/vendor/plugins/audioscrobbler_sidebar/test/audioscrobbler_sidebar_test.rb +0 -8
- data/vendor/plugins/audioscrobbler_sidebar/views/content.rhtml +0 -10
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -100,4 +100,4 @@ var FCKToolbarSeparator = function()
|
|
100
100
|
FCKToolbarSeparator.prototype.Create = function( parentElement )
|
101
101
|
{
|
102
102
|
FCKTools.AppendElement( parentElement, 'div' ).className = 'TB_Separator' ;
|
103
|
-
}
|
103
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -33,4 +33,4 @@ FCKToolbarBreak.prototype.Create = function( targetElement )
|
|
33
33
|
oBreakDiv.style.clear = oBreakDiv.style.cssFloat = FCKLang.Dir == 'rtl' ? 'right' : 'left' ;
|
34
34
|
|
35
35
|
targetElement.appendChild( oBreakDiv ) ;
|
36
|
-
}
|
36
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -48,14 +48,19 @@ FCKToolbarButton.prototype.Create = function( targetElement )
|
|
48
48
|
|
49
49
|
FCKToolbarButton.prototype.RefreshState = function()
|
50
50
|
{
|
51
|
+
var uiButton = this._UIButton ;
|
52
|
+
|
53
|
+
if ( !uiButton )
|
54
|
+
return ;
|
55
|
+
|
51
56
|
// Gets the actual state.
|
52
57
|
var eState = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName ).GetState() ;
|
53
58
|
|
54
59
|
// If there are no state changes than do nothing and return.
|
55
|
-
if ( eState ==
|
60
|
+
if ( eState == uiButton.State ) return ;
|
56
61
|
|
57
62
|
// Sets the actual state.
|
58
|
-
|
63
|
+
uiButton.ChangeState( eState ) ;
|
59
64
|
}
|
60
65
|
|
61
66
|
FCKToolbarButton.prototype.Click = function()
|
@@ -73,4 +78,4 @@ FCKToolbarButton.prototype.Disable = function()
|
|
73
78
|
{
|
74
79
|
// Sets the actual state.
|
75
80
|
this._UIButton.ChangeState( FCK_TRISTATE_DISABLED ) ;
|
76
|
-
}
|
81
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -126,6 +126,10 @@ FCKToolbarButtonUI.prototype.ChangeState = function( newState, force )
|
|
126
126
|
|
127
127
|
var e = this.MainElement ;
|
128
128
|
|
129
|
+
// In IE it can happen when the page is reloaded that MainElement is null, so exit here
|
130
|
+
if ( !e )
|
131
|
+
return ;
|
132
|
+
|
129
133
|
switch ( parseInt( newState, 10 ) )
|
130
134
|
{
|
131
135
|
case FCK_TRISTATE_OFF :
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -34,7 +34,7 @@ var FCKToolbarFontFormatCombo = function( tooltip, style )
|
|
34
34
|
this.NormalLabel = 'Normal' ;
|
35
35
|
|
36
36
|
this.PanelWidth = 190 ;
|
37
|
-
|
37
|
+
|
38
38
|
this.DefaultLabel = FCKConfig.DefaultFontFormatLabel || '' ;
|
39
39
|
}
|
40
40
|
|
@@ -64,7 +64,7 @@ FCKToolbarFontFormatCombo.prototype.GetStyles = function()
|
|
64
64
|
h6 : aNames[8],
|
65
65
|
div : aNames[9] || ( aNames[0] + ' (DIV)')
|
66
66
|
} ;
|
67
|
-
|
67
|
+
|
68
68
|
// Get the available formats from the configuration file.
|
69
69
|
var elements = FCKConfig.FontFormats.split(';') ;
|
70
70
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -48,13 +48,21 @@ FCKToolbarPanelButton.prototype.Create = function( parentElement )
|
|
48
48
|
this._UIButton.Create( parentElement ) ;
|
49
49
|
|
50
50
|
var oPanel = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( this.CommandName )._Panel ;
|
51
|
+
this.RegisterPanel( oPanel ) ;
|
52
|
+
}
|
53
|
+
|
54
|
+
FCKToolbarPanelButton.prototype.RegisterPanel = function( oPanel )
|
55
|
+
{
|
56
|
+
if ( oPanel._FCKToolbarPanelButton )
|
57
|
+
return ;
|
58
|
+
|
51
59
|
oPanel._FCKToolbarPanelButton = this ;
|
52
60
|
|
53
61
|
var eLineDiv = oPanel.Document.body.appendChild( oPanel.Document.createElement( 'div' ) ) ;
|
54
62
|
eLineDiv.style.position = 'absolute' ;
|
55
63
|
eLineDiv.style.top = '0px' ;
|
56
64
|
|
57
|
-
var eLine =
|
65
|
+
var eLine = oPanel._FCKToolbarPanelButtonLineDiv = eLineDiv.appendChild( oPanel.Document.createElement( 'IMG' ) ) ;
|
58
66
|
eLine.className = 'TB_ConnectionLine' ;
|
59
67
|
eLine.style.position = 'absolute' ;
|
60
68
|
// eLine.style.backgroundColor = 'Red' ;
|
@@ -74,9 +82,12 @@ function FCKToolbarPanelButton_OnButtonClick( toolbarButton )
|
|
74
82
|
|
75
83
|
oButton._UIButton.ChangeState( FCK_TRISTATE_ON ) ;
|
76
84
|
|
77
|
-
oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ;
|
85
|
+
// oButton.LineImg.style.width = ( e.offsetWidth - 2 ) + 'px' ;
|
78
86
|
|
79
|
-
FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oButton.CommandName )
|
87
|
+
var oCommand = FCK.ToolbarSet.CurrentInstance.Commands.GetCommand( oButton.CommandName ) ;
|
88
|
+
var oPanel = oCommand._Panel ;
|
89
|
+
oPanel._FCKToolbarPanelButtonLineDiv.style.width = ( e.offsetWidth - 2 ) + 'px' ;
|
90
|
+
oCommand.Execute( 0, e.offsetHeight - 1, e ) ; // -1 to be over the border
|
80
91
|
}
|
81
92
|
|
82
93
|
function FCKToolbarPanelButton_OnPanelHide()
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -32,6 +32,9 @@ var FCKToolbarSpecialCombo = function()
|
|
32
32
|
{
|
33
33
|
this.SourceView = false ;
|
34
34
|
this.ContextSensitive = true ;
|
35
|
+
this.FieldWidth = null ;
|
36
|
+
this.PanelWidth = null ;
|
37
|
+
this.PanelMaxHeight = null ;
|
35
38
|
//this._LastValue = null ;
|
36
39
|
}
|
37
40
|
|
@@ -98,7 +101,7 @@ FCKToolbarSpecialCombo.prototype.RefreshState = function()
|
|
98
101
|
if ( this._LastValue !== sValue)
|
99
102
|
{
|
100
103
|
this._LastValue = sValue ;
|
101
|
-
|
104
|
+
|
102
105
|
if ( !sValue || sValue.length == 0 )
|
103
106
|
{
|
104
107
|
this._Combo.DeselectAll() ;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -76,10 +76,10 @@ FCKToolbarStyleCombo.prototype.CreateItems = function( targetSpecialCombo )
|
|
76
76
|
var style = styles[ styleName ] ;
|
77
77
|
|
78
78
|
// Object type styles have no preview.
|
79
|
-
var caption = style.GetType() == FCK_STYLE_OBJECT ?
|
80
|
-
styleName :
|
79
|
+
var caption = style.GetType() == FCK_STYLE_OBJECT ?
|
80
|
+
styleName :
|
81
81
|
FCKToolbarStyleCombo_BuildPreview( style, style.Label || styleName ) ;
|
82
|
-
|
82
|
+
|
83
83
|
var item = targetSpecialCombo.AddItem( styleName, caption ) ;
|
84
84
|
|
85
85
|
item.Style = style ;
|
@@ -123,16 +123,16 @@ FCKToolbarStyleCombo.prototype.StyleCombo_OnBeforeClick = function( targetSpecia
|
|
123
123
|
// - In a control selection, get the element name, so we'll display styles
|
124
124
|
// for that element only.
|
125
125
|
// - Select the styles that are active for the current selection.
|
126
|
-
|
126
|
+
|
127
127
|
// Clear the current selection.
|
128
128
|
targetSpecialCombo.DeselectAll() ;
|
129
129
|
|
130
130
|
var startElement ;
|
131
131
|
var path ;
|
132
132
|
var tagName ;
|
133
|
-
|
133
|
+
|
134
134
|
var selection = FCK.ToolbarSet.CurrentInstance.Selection ;
|
135
|
-
|
135
|
+
|
136
136
|
if ( selection.GetType() == 'Control' )
|
137
137
|
{
|
138
138
|
startElement = selection.GetSelectedElement() ;
|
@@ -148,7 +148,7 @@ FCKToolbarStyleCombo.prototype.StyleCombo_OnBeforeClick = function( targetSpecia
|
|
148
148
|
{
|
149
149
|
var item = targetSpecialCombo.Items[i] ;
|
150
150
|
var style = item.Style ;
|
151
|
-
|
151
|
+
|
152
152
|
if ( ( tagName && style.Element == tagName ) || ( !tagName && style.GetType() != FCK_STYLE_OBJECT ) )
|
153
153
|
{
|
154
154
|
item.style.display = '' ;
|
@@ -161,16 +161,16 @@ FCKToolbarStyleCombo.prototype.StyleCombo_OnBeforeClick = function( targetSpecia
|
|
161
161
|
}
|
162
162
|
}
|
163
163
|
|
164
|
-
function FCKToolbarStyleCombo_BuildPreview( style, caption )
|
164
|
+
function FCKToolbarStyleCombo_BuildPreview( style, caption )
|
165
165
|
{
|
166
166
|
var styleType = style.GetType() ;
|
167
167
|
var html = [] ;
|
168
|
-
|
168
|
+
|
169
169
|
if ( styleType == FCK_STYLE_BLOCK )
|
170
170
|
html.push( '<div class="BaseFont">' ) ;
|
171
|
-
|
171
|
+
|
172
172
|
var elementName = style.Element ;
|
173
|
-
|
173
|
+
|
174
174
|
// Avoid <bdo> in the preview.
|
175
175
|
if ( elementName == 'bdo' )
|
176
176
|
elementName = 'span' ;
|
@@ -197,4 +197,4 @@ function FCKToolbarStyleCombo_BuildPreview( style, caption )
|
|
197
197
|
html.push( '</div>' ) ;
|
198
198
|
|
199
199
|
return html.join( '' ) ;
|
200
|
-
}
|
200
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -261,19 +261,23 @@ FCKW3CRange.prototype =
|
|
261
261
|
{
|
262
262
|
// If the start container has children and the offset is pointing
|
263
263
|
// to a child, then we should start from its previous sibling.
|
264
|
-
|
264
|
+
|
265
|
+
// If the offset points to the first node, we don't have a
|
266
|
+
// sibling, so let's use the first one, but mark it for removal.
|
267
|
+
if ( startOffset == 0 )
|
265
268
|
{
|
266
|
-
//
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
startNode = startNode.childNodes[ startOffset ].previousSibling ;
|
269
|
+
// Let's create a temporary node and mark it for removal.
|
270
|
+
startNode = startNode.insertBefore( this._Document.createTextNode(''), startNode.firstChild ) ;
|
271
|
+
removeStartNode = true ;
|
272
|
+
}
|
273
|
+
else if ( startOffset > startNode.childNodes.length - 1 )
|
274
|
+
{
|
275
|
+
// Let's create a temporary node and mark it for removal.
|
276
|
+
startNode = startNode.appendChild( this._Document.createTextNode('') ) ;
|
277
|
+
removeStartNode = true ;
|
276
278
|
}
|
279
|
+
else
|
280
|
+
startNode = startNode.childNodes[ startOffset ].previousSibling ;
|
277
281
|
}
|
278
282
|
|
279
283
|
// Get the parent nodes tree for the start and end boundaries.
|
@@ -419,7 +423,7 @@ FCKW3CRange.prototype =
|
|
419
423
|
if ( topStart && topEnd && ( startNode.parentNode != topStart.parentNode || endNode.parentNode != topEnd.parentNode ) )
|
420
424
|
{
|
421
425
|
var endIndex = FCKDomTools.GetIndexOf( topEnd ) ;
|
422
|
-
|
426
|
+
|
423
427
|
// If the start node is to be removed, we must correct the
|
424
428
|
// index to reflect the removal.
|
425
429
|
if ( removeStartNode && topEnd.parentNode == startNode.parentNode )
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -105,4 +105,4 @@ FCKXml.TransformToObject = function( element )
|
|
105
105
|
}
|
106
106
|
|
107
107
|
return obj ;
|
108
|
-
}
|
108
|
+
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -26,28 +26,43 @@ FCKXml.prototype =
|
|
26
26
|
LoadUrl : function( urlToCall )
|
27
27
|
{
|
28
28
|
this.Error = false ;
|
29
|
-
var oFCKXml = this ;
|
30
29
|
|
30
|
+
var oXml ;
|
31
31
|
var oXmlHttp = FCKTools.CreateXmlObject( 'XmlHttp' ) ;
|
32
|
-
oXmlHttp.open(
|
32
|
+
oXmlHttp.open( 'GET', urlToCall, false ) ;
|
33
33
|
oXmlHttp.send( null ) ;
|
34
34
|
|
35
35
|
if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 )
|
36
|
-
|
36
|
+
oXml = oXmlHttp.responseXML ;
|
37
37
|
else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 )
|
38
|
-
|
38
|
+
oXml = oXmlHttp.responseXML ;
|
39
39
|
else
|
40
|
-
|
40
|
+
oXml = null ;
|
41
41
|
|
42
|
-
if (
|
42
|
+
if ( oXml )
|
43
43
|
{
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
44
|
+
// Try to access something on it.
|
45
|
+
try
|
46
|
+
{
|
47
|
+
var test = oXml.firstChild ;
|
48
|
+
}
|
49
|
+
catch (e)
|
50
|
+
{
|
51
|
+
// If document.domain has been changed (#123), we'll have a security
|
52
|
+
// error at this point. The workaround here is parsing the responseText:
|
53
|
+
// http://alexander.kirk.at/2006/07/27/firefox-15-xmlhttprequest-reqresponsexml-and-documentdomain/
|
54
|
+
oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
|
55
|
+
}
|
56
|
+
}
|
49
57
|
|
58
|
+
if ( !oXml || !oXml.firstChild )
|
59
|
+
{
|
60
|
+
this.Error = true ;
|
61
|
+
if ( window.confirm( 'Error loading "' + urlToCall + '" (HTTP Status: ' + oXmlHttp.status + ').\r\nDo you want to see the server response dump?' ) )
|
62
|
+
alert( oXmlHttp.responseText ) ;
|
50
63
|
}
|
64
|
+
|
65
|
+
this.DOMDocument = oXml ;
|
51
66
|
},
|
52
67
|
|
53
68
|
SelectNodes : function( xpath, contextNode )
|
@@ -84,4 +99,4 @@ FCKXml.prototype =
|
|
84
99
|
else
|
85
100
|
return null ;
|
86
101
|
}
|
87
|
-
} ;
|
102
|
+
} ;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -85,4 +85,4 @@ FCKXml.prototype =
|
|
85
85
|
else
|
86
86
|
return this.DOMDocument.selectSingleNode( xpath ) ;
|
87
87
|
}
|
88
|
-
} ;
|
88
|
+
} ;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
/*
|
2
2
|
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
|
3
|
-
* Copyright (C) 2003-
|
3
|
+
* Copyright (C) 2003-2008 Frederico Caldeira Knabben
|
4
4
|
*
|
5
5
|
* == BEGIN LICENSE ==
|
6
6
|
*
|
@@ -23,13 +23,14 @@
|
|
23
23
|
*/
|
24
24
|
|
25
25
|
// ### General Dialog Box Commands.
|
26
|
-
var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam )
|
26
|
+
var FCKDialogCommand = function( name, title, url, width, height, getStateFunction, getStateParam, customValue )
|
27
27
|
{
|
28
28
|
this.Name = name ;
|
29
29
|
this.Title = title ;
|
30
30
|
this.Url = url ;
|
31
31
|
this.Width = width ;
|
32
32
|
this.Height = height ;
|
33
|
+
this.CustomValue = customValue ;
|
33
34
|
|
34
35
|
this.GetStateFunction = getStateFunction ;
|
35
36
|
this.GetStateParam = getStateParam ;
|
@@ -39,7 +40,7 @@ var FCKDialogCommand = function( name, title, url, width, height, getStateFuncti
|
|
39
40
|
|
40
41
|
FCKDialogCommand.prototype.Execute = function()
|
41
42
|
{
|
42
|
-
FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height,
|
43
|
+
FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ;
|
43
44
|
}
|
44
45
|
|
45
46
|
FCKDialogCommand.prototype.GetState = function()
|
@@ -47,7 +48,7 @@ FCKDialogCommand.prototype.GetState = function()
|
|
47
48
|
if ( this.GetStateFunction )
|
48
49
|
return this.GetStateFunction( this.GetStateParam ) ;
|
49
50
|
else
|
50
|
-
return FCK_TRISTATE_OFF ;
|
51
|
+
return FCK.EditMode == FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
|
51
52
|
}
|
52
53
|
|
53
54
|
// Generic Undefined command (usually used when a command is under development).
|
@@ -71,12 +72,12 @@ FCKUndefinedCommand.prototype.GetState = function()
|
|
71
72
|
var FCKFormatBlockCommand = function()
|
72
73
|
{}
|
73
74
|
|
74
|
-
FCKFormatBlockCommand.prototype =
|
75
|
+
FCKFormatBlockCommand.prototype =
|
75
76
|
{
|
76
77
|
Name : 'FormatBlock',
|
77
|
-
|
78
|
+
|
78
79
|
Execute : FCKStyleCommand.prototype.Execute,
|
79
|
-
|
80
|
+
|
80
81
|
GetState : function()
|
81
82
|
{
|
82
83
|
return FCK.EditorDocument ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
|
@@ -88,7 +89,7 @@ FCKFormatBlockCommand.prototype =
|
|
88
89
|
var FCKFontNameCommand = function()
|
89
90
|
{}
|
90
91
|
|
91
|
-
FCKFontNameCommand.prototype =
|
92
|
+
FCKFontNameCommand.prototype =
|
92
93
|
{
|
93
94
|
Name : 'FontName',
|
94
95
|
Execute : FCKStyleCommand.prototype.Execute,
|
@@ -99,7 +100,7 @@ FCKFontNameCommand.prototype =
|
|
99
100
|
var FCKFontSizeCommand = function()
|
100
101
|
{}
|
101
102
|
|
102
|
-
FCKFontSizeCommand.prototype =
|
103
|
+
FCKFontSizeCommand.prototype =
|
103
104
|
{
|
104
105
|
Name : 'FontSize',
|
105
106
|
Execute : FCKStyleCommand.prototype.Execute,
|
@@ -209,6 +210,8 @@ FCKUndoCommand.prototype.Execute = function()
|
|
209
210
|
|
210
211
|
FCKUndoCommand.prototype.GetState = function()
|
211
212
|
{
|
213
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
214
|
+
return FCK_TRISTATE_DISABLED ;
|
212
215
|
return ( FCKUndo.CheckUndoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
|
213
216
|
}
|
214
217
|
|
@@ -225,6 +228,8 @@ FCKRedoCommand.prototype.Execute = function()
|
|
225
228
|
|
226
229
|
FCKRedoCommand.prototype.GetState = function()
|
227
230
|
{
|
231
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
232
|
+
return FCK_TRISTATE_DISABLED ;
|
228
233
|
return ( FCKUndo.CheckRedoState() ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ) ;
|
229
234
|
}
|
230
235
|
|
@@ -249,11 +254,18 @@ FCKPageBreakCommand.prototype.Execute = function()
|
|
249
254
|
e.innerHTML = '<span style="DISPLAY:none"> </span>' ;
|
250
255
|
|
251
256
|
var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ;
|
252
|
-
FCK.
|
257
|
+
var oRange = new FCKDomRange( FCK.EditorWindow ) ;
|
258
|
+
oRange.MoveToSelection() ;
|
259
|
+
var oSplitInfo = oRange.SplitBlock() ;
|
260
|
+
oRange.InsertNode( oFakeImage ) ;
|
261
|
+
|
262
|
+
FCK.Events.FireEvent( 'OnSelectionChange' ) ;
|
253
263
|
}
|
254
264
|
|
255
265
|
FCKPageBreakCommand.prototype.GetState = function()
|
256
266
|
{
|
267
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
268
|
+
return FCK_TRISTATE_DISABLED ;
|
257
269
|
return 0 ; // FCK_TRISTATE_OFF
|
258
270
|
}
|
259
271
|
|
@@ -277,12 +289,14 @@ FCKUnlinkCommand.prototype.Execute = function()
|
|
277
289
|
|
278
290
|
return ;
|
279
291
|
}
|
280
|
-
|
292
|
+
|
281
293
|
FCK.ExecuteNamedCommand( this.Name ) ;
|
282
294
|
}
|
283
295
|
|
284
296
|
FCKUnlinkCommand.prototype.GetState = function()
|
285
297
|
{
|
298
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
299
|
+
return FCK_TRISTATE_DISABLED ;
|
286
300
|
var state = FCK.GetNamedCommandState( this.Name ) ;
|
287
301
|
|
288
302
|
// Check that it isn't an anchor
|
@@ -328,6 +342,8 @@ FCKSelectAllCommand.prototype.Execute = function()
|
|
328
342
|
|
329
343
|
FCKSelectAllCommand.prototype.GetState = function()
|
330
344
|
{
|
345
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
346
|
+
return FCK_TRISTATE_DISABLED ;
|
331
347
|
return FCK_TRISTATE_OFF ;
|
332
348
|
}
|
333
349
|
|
@@ -349,6 +365,8 @@ FCKPasteCommand.prototype =
|
|
349
365
|
|
350
366
|
GetState : function()
|
351
367
|
{
|
368
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
369
|
+
return FCK_TRISTATE_DISABLED ;
|
352
370
|
return FCK.GetNamedCommandState( 'Paste' ) ;
|
353
371
|
}
|
354
372
|
} ;
|
@@ -369,27 +387,63 @@ FCKRuleCommand.prototype =
|
|
369
387
|
|
370
388
|
GetState : function()
|
371
389
|
{
|
390
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
391
|
+
return FCK_TRISTATE_DISABLED ;
|
372
392
|
return FCK.GetNamedCommandState( 'InsertHorizontalRule' ) ;
|
373
393
|
}
|
374
394
|
} ;
|
375
395
|
|
376
|
-
//
|
377
|
-
var
|
396
|
+
// FCKCutCopyCommand
|
397
|
+
var FCKCutCopyCommand = function( isCut )
|
378
398
|
{
|
379
|
-
this.Name = 'Copy' ;
|
399
|
+
this.Name = isCut ? 'Cut' : 'Copy' ;
|
380
400
|
}
|
381
401
|
|
382
|
-
|
402
|
+
FCKCutCopyCommand.prototype =
|
383
403
|
{
|
384
404
|
Execute : function()
|
385
405
|
{
|
386
|
-
|
406
|
+
var enabled = false ;
|
407
|
+
|
408
|
+
if ( FCKBrowserInfo.IsIE )
|
409
|
+
{
|
410
|
+
// The following seems to be the only reliable way to detect that
|
411
|
+
// cut/copy is enabled in IE. It will fire the oncut/oncopy event
|
412
|
+
// only if the security settings enabled the command to execute.
|
413
|
+
|
414
|
+
var onEvent = function()
|
415
|
+
{
|
416
|
+
enabled = true ;
|
417
|
+
} ;
|
418
|
+
|
419
|
+
var eventName = 'on' + this.Name.toLowerCase() ;
|
420
|
+
|
421
|
+
FCK.EditorDocument.body.attachEvent( eventName, onEvent ) ;
|
422
|
+
FCK.ExecuteNamedCommand( this.Name ) ;
|
423
|
+
FCK.EditorDocument.body.detachEvent( eventName, onEvent ) ;
|
424
|
+
}
|
425
|
+
else
|
426
|
+
{
|
427
|
+
try
|
428
|
+
{
|
429
|
+
// Other browsers throw an error if the command is disabled.
|
430
|
+
FCK.ExecuteNamedCommand( this.Name ) ;
|
431
|
+
enabled = true ;
|
432
|
+
}
|
433
|
+
catch(e){}
|
434
|
+
}
|
435
|
+
|
436
|
+
if ( !enabled )
|
437
|
+
alert( FCKLang[ 'PasteError' + this.Name ] ) ;
|
387
438
|
},
|
388
439
|
|
389
440
|
GetState : function()
|
390
441
|
{
|
391
|
-
// Strangely, the
|
392
|
-
|
442
|
+
// Strangely, the Cut command happens to have the correct states for
|
443
|
+
// both Copy and Cut in all browsers.
|
444
|
+
return FCK.EditMode != FCK_EDITMODE_WYSIWYG ?
|
445
|
+
FCK_TRISTATE_DISABLED :
|
446
|
+
FCK.GetNamedCommandState( 'Cut' ) ;
|
393
447
|
}
|
394
448
|
};
|
395
449
|
|
@@ -398,7 +452,7 @@ var FCKAnchorDeleteCommand = function()
|
|
398
452
|
this.Name = 'AnchorDelete' ;
|
399
453
|
}
|
400
454
|
|
401
|
-
FCKAnchorDeleteCommand.prototype =
|
455
|
+
FCKAnchorDeleteCommand.prototype =
|
402
456
|
{
|
403
457
|
Execute : function()
|
404
458
|
{
|
@@ -457,6 +511,8 @@ FCKAnchorDeleteCommand.prototype =
|
|
457
511
|
|
458
512
|
GetState : function()
|
459
513
|
{
|
514
|
+
if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
|
515
|
+
return FCK_TRISTATE_DISABLED ;
|
460
516
|
return FCK.GetNamedCommandState( 'Unlink') ;
|
461
517
|
}
|
462
518
|
};
|