ckeditor 4.1.6 → 4.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +14 -21
- data/README.md +24 -13
- data/app/controllers/ckeditor/application_controller.rb +4 -4
- data/app/controllers/ckeditor/attachment_files_controller.rb +2 -2
- data/app/controllers/ckeditor/pictures_controller.rb +1 -1
- data/app/views/ckeditor/attachment_files/index.html.erb +1 -1
- data/lib/ckeditor.rb +28 -19
- data/lib/ckeditor/asset_response.rb +68 -24
- data/lib/ckeditor/backend/carrierwave.rb +8 -5
- data/lib/ckeditor/backend/dragonfly.rb +5 -3
- data/lib/ckeditor/backend/paperclip.rb +19 -19
- data/lib/ckeditor/backend/refile.rb +5 -3
- data/lib/ckeditor/helpers/controllers.rb +19 -19
- data/lib/ckeditor/helpers/form_builder.rb +1 -1
- data/lib/ckeditor/hooks/cancan.rb +0 -2
- data/lib/ckeditor/hooks/formtastic.rb +2 -2
- data/lib/ckeditor/hooks/pundit.rb +1 -4
- data/lib/ckeditor/hooks/simple_form.rb +9 -14
- data/lib/ckeditor/http.rb +9 -11
- data/lib/ckeditor/orm/active_record.rb +2 -2
- data/lib/ckeditor/orm/base.rb +4 -4
- data/lib/ckeditor/orm/mongoid.rb +5 -5
- data/lib/ckeditor/paginatable.rb +1 -1
- data/lib/ckeditor/rails.rb +33 -0
- data/lib/ckeditor/text_area.rb +14 -14
- data/lib/ckeditor/utils.rb +18 -20
- data/lib/ckeditor/utils/content_type_detector.rb +7 -10
- data/lib/ckeditor/utils/javascript_code.rb +8 -3
- data/lib/ckeditor/version.rb +2 -2
- data/lib/generators/ckeditor/install_generator.rb +39 -30
- data/lib/generators/ckeditor/pundit_policy_generator.rb +1 -3
- data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/asset.rb +2 -2
- data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/attachment_file.rb +1 -1
- data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/picture.rb +1 -1
- data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb +7 -7
- data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/asset.rb +1 -1
- data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/attachment_file.rb +1 -1
- data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/picture.rb +4 -4
- data/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb +7 -7
- data/lib/generators/ckeditor/templates/active_record/paperclip/ckeditor/attachment_file.rb +3 -3
- data/lib/generators/ckeditor/templates/active_record/paperclip/ckeditor/picture.rb +5 -5
- data/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb +3 -3
- data/lib/generators/ckeditor/templates/active_record/refile/migration.rb +8 -9
- data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_picture_uploader.rb +4 -4
- data/lib/generators/ckeditor/templates/base/dragonfly/initializer.rb +4 -5
- data/lib/generators/ckeditor/templates/ckeditor.rb +11 -2
- data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/asset.rb +2 -2
- data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/attachment_file.rb +1 -1
- data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/picture.rb +1 -1
- data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/attachment_file.rb +5 -5
- data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/picture.rb +5 -5
- data/test/dummy/config/initializers/assets.rb +1 -0
- data/test/dummy/config/initializers/paperclip.rb +3 -0
- data/test/dummy/public/ckeditor_assets/attachments/1/rails_tar.gz +0 -0
- data/test/dummy/public/ckeditor_assets/pictures/1/content_rails.png +0 -0
- data/test/dummy/public/ckeditor_assets/pictures/1/original_rails.png +0 -0
- data/test/dummy/public/ckeditor_assets/pictures/1/thumb_rails.png +0 -0
- data/test/dummy/public/uploads/ckeditor/attachments/1/rails.tar.gz +0 -0
- data/test/dummy/public/uploads/ckeditor/pictures/1/content_rails.png +0 -0
- data/test/dummy/public/uploads/ckeditor/pictures/1/rails.png +0 -0
- data/test/dummy/public/uploads/ckeditor/pictures/1/thumb_rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-1241/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-1405/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-2164/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-6603/rails.png +0 -0
- data/test/dummy/public/uploads/tmp/1468570200-60772-8111/rails.png +0 -0
- data/test/functional/posts_controller_test.rb +2 -3
- data/test/models/ckeditor_test.rb +1 -1
- data/test/tmp/app/models/ckeditor/asset.rb +5 -0
- data/test/tmp/app/models/ckeditor/attachment_file.rb +13 -0
- data/test/tmp/app/models/ckeditor/picture.rb +14 -0
- data/test/tmp/config/initializers/ckeditor.rb +58 -0
- data/test/tmp/config/routes.rb +5 -0
- data/vendor/assets/javascripts/ckeditor/CHANGES.md +59 -1
- data/vendor/assets/javascripts/ckeditor/LICENSE.md +2 -2
- data/vendor/assets/javascripts/ckeditor/README.md +1 -1
- data/vendor/assets/javascripts/ckeditor/adapters/jquery.js +1 -1
- data/vendor/assets/javascripts/ckeditor/ckeditor.js +434 -430
- data/vendor/assets/javascripts/ckeditor/config.js +1 -1
- data/vendor/assets/javascripts/ckeditor/contents.css +4 -1
- data/vendor/assets/javascripts/ckeditor/lang/af.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ar.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/bg.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/bn.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/bs.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/cs.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/cy.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/da.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/de-ch.js +5 -0
- data/vendor/assets/javascripts/ckeditor/lang/de.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/el.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/en-au.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en-ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en-gb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/eo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/es.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/et.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/eu.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/fa.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fr-ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/fr.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/gl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/gu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/he.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/hi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/hr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/hu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/id.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/is.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/it.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ja.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ka.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/km.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ko.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ku.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/lt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/lv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/mk.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/mn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ms.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/nb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/nl.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/no.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/pl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/pt-br.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/pt.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/ro.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/si.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sk.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/sl.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/sq.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sr-latn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/sv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/th.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/tr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/tt.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/ug.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/uk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/vi.js +2 -2
- data/vendor/assets/javascripts/ckeditor/lang/zh-cn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/zh.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/af.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/da.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js +12 -0
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/de.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/el.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/es.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/et.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js +9 -9
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/he.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/id.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/it.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/km.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js +7 -7
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/no.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js +7 -7
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/si.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js +6 -6
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/th.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/about/dialogs/about.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.css +20 -0
- data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js +11 -10
- data/vendor/assets/javascripts/ckeditor/plugins/dialog/dialogDefinition.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/find/dialogs/find.js +12 -11
- data/vendor/assets/javascripts/ckeditor/plugins/flash/dialogs/flash.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/button.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/checkbox.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/form.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/radio.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/select.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textarea.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textfield.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image/dialogs/image.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/link.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/scayt/CHANGELOG.md +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/dialogs/smiley.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/af.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ar.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/bg.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/cs.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/cy.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/da.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js +13 -0
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/de.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/el.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/eo.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/es.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/et.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/eu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/fa.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/fi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/fr.js +9 -8
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/gl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/he.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/hr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/hu.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/id.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/it.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ja.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/km.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ko.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ku.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/lt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/lv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/nb.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/nl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/no.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/pl.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/pt.js +10 -10
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/si.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/sk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/sl.js +9 -9
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/sq.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/sv.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/th.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/tr.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/tt.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ug.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/uk.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/vi.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/zh.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/specialchar.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/table/dialogs/table.js +18 -18
- data/vendor/assets/javascripts/ckeditor/plugins/tabletools/dialogs/tableCell.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.css +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/templates/templates/default.js +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie7.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie8.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_iequirks.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_gecko.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie7.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie8.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_iequirks.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/readme.md +1 -1
- data/vendor/assets/javascripts/ckeditor/styles.js +1 -1
- metadata +120 -75
- data/lib/ckeditor/engine.rb +0 -46
@@ -1,6 +1,8 @@
|
|
1
1
|
module Ckeditor
|
2
2
|
module Backend
|
3
3
|
module Dragonfly
|
4
|
+
FORMATS = %w(bz2 gz lzma xz).freeze
|
5
|
+
|
4
6
|
def self.included(base)
|
5
7
|
base.send(:extend, ::Dragonfly::Model)
|
6
8
|
base.send(:extend, ::Dragonfly::Model::Validations)
|
@@ -14,7 +16,7 @@ module Ckeditor
|
|
14
16
|
# This is not ideal but Dragonfly doesn't return double
|
15
17
|
# extensions. Having said that, the other backends
|
16
18
|
# currently don't use attachment_file_types at all.
|
17
|
-
|
19
|
+
FORMATS.each do |f|
|
18
20
|
formats << f if formats.include?("tar.#{f}")
|
19
21
|
end
|
20
22
|
end
|
@@ -26,7 +28,7 @@ module Ckeditor
|
|
26
28
|
end
|
27
29
|
|
28
30
|
module InstanceMethods
|
29
|
-
delegate :url, :path, :size, :image?, :width, :height, :
|
31
|
+
delegate :url, :path, :size, :image?, :width, :height, to: :data
|
30
32
|
|
31
33
|
alias_attribute :data_file_name, :data_name
|
32
34
|
alias_attribute :data_content_type, :"data.mime_type"
|
@@ -36,7 +38,7 @@ module Ckeditor
|
|
36
38
|
|
37
39
|
def url_thumb_options
|
38
40
|
if data.basename.present?
|
39
|
-
{ :
|
41
|
+
{ basename: "thumb_#{data.basename}" }
|
40
42
|
else
|
41
43
|
{}
|
42
44
|
end
|
@@ -10,9 +10,9 @@ module Ckeditor
|
|
10
10
|
def self.extended(base)
|
11
11
|
base.class_eval do
|
12
12
|
before_validation :extract_content_type
|
13
|
-
before_create :
|
13
|
+
before_create :extract_dimensions, :parameterize_filename
|
14
14
|
|
15
|
-
delegate :url, :path, :styles, :size, :content_type, :
|
15
|
+
delegate :url, :path, :styles, :size, :content_type, to: :data
|
16
16
|
end
|
17
17
|
end
|
18
18
|
end
|
@@ -24,28 +24,28 @@ module Ckeditor
|
|
24
24
|
|
25
25
|
protected
|
26
26
|
|
27
|
-
|
28
|
-
|
29
|
-
|
27
|
+
def file
|
28
|
+
@file ||= data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
|
29
|
+
end
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
end
|
31
|
+
def parameterize_filename
|
32
|
+
unless data_file_name.blank?
|
33
|
+
filename = Ckeditor::Utils.parameterize_filename(data_file_name)
|
34
|
+
data.instance_write(:file_name, filename)
|
36
35
|
end
|
36
|
+
end
|
37
37
|
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
end
|
38
|
+
def extract_dimensions
|
39
|
+
if image? && has_dimensions?
|
40
|
+
self.width = geometry.width
|
41
|
+
self.height = geometry.height
|
43
42
|
end
|
43
|
+
end
|
44
44
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
45
|
+
def extract_content_type
|
46
|
+
path = file.nil? ? nil : file.path
|
47
|
+
self.data_content_type = Utils::ContentTypeDetector.new(path).detect
|
48
|
+
end
|
49
49
|
end
|
50
50
|
end
|
51
51
|
end
|
@@ -24,14 +24,16 @@ module Ckeditor
|
|
24
24
|
::Refile.attachment_url(self, :data, *attrs)
|
25
25
|
end
|
26
26
|
|
27
|
-
def
|
27
|
+
def magick
|
28
|
+
@magick ||= MiniMagick::Image.open(model.to_io)
|
29
|
+
end
|
30
|
+
|
31
|
+
def extract_dimensions
|
28
32
|
if model.image? && model.has_dimensions?
|
29
|
-
magick = MiniMagick::Image.open(model.to_io)
|
30
33
|
model.width = magick.width
|
31
34
|
model.height = magick.height
|
32
35
|
end
|
33
36
|
end
|
34
|
-
|
35
37
|
end
|
36
38
|
end
|
37
39
|
end
|
@@ -5,30 +5,30 @@ module Ckeditor
|
|
5
5
|
|
6
6
|
protected
|
7
7
|
|
8
|
-
|
9
|
-
|
10
|
-
|
8
|
+
def ckeditor_current_user
|
9
|
+
instance_exec(&Ckeditor.current_user_method)
|
10
|
+
end
|
11
11
|
|
12
|
-
|
13
|
-
|
14
|
-
|
12
|
+
def ckeditor_authorize!
|
13
|
+
instance_exec(&Ckeditor.authorize_with)
|
14
|
+
end
|
15
15
|
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
16
|
+
def ckeditor_before_create_asset(asset)
|
17
|
+
asset.assetable = ckeditor_current_user if ckeditor_current_user
|
18
|
+
true
|
19
|
+
end
|
20
20
|
|
21
|
-
|
22
|
-
|
23
|
-
|
21
|
+
def ckeditor_pictures_scope(options = {})
|
22
|
+
ckeditor_filebrowser_scope(options)
|
23
|
+
end
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
25
|
+
def ckeditor_attachment_files_scope(options = {})
|
26
|
+
ckeditor_filebrowser_scope(options)
|
27
|
+
end
|
28
28
|
|
29
|
-
|
30
|
-
|
31
|
-
|
29
|
+
def ckeditor_filebrowser_scope(options = {})
|
30
|
+
{ order: [:id, :desc] }.merge(options)
|
31
|
+
end
|
32
32
|
end
|
33
33
|
end
|
34
34
|
end
|
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require 'formtastic'
|
2
2
|
|
3
3
|
class CkeditorInput
|
4
4
|
include ::Formtastic::Inputs::Base
|
@@ -6,7 +6,7 @@ class CkeditorInput
|
|
6
6
|
def to_html
|
7
7
|
input_wrapping do
|
8
8
|
label_html <<
|
9
|
-
|
9
|
+
builder.cktext_area(method, input_html_options)
|
10
10
|
end
|
11
11
|
end
|
12
12
|
end
|
@@ -6,7 +6,6 @@ module Ckeditor
|
|
6
6
|
# You can create another adapter for different authorization behavior, just be certain it
|
7
7
|
# responds to each of the public methods here.
|
8
8
|
class PunditAuthorization
|
9
|
-
|
10
9
|
include Ckeditor::Helpers::Controllers
|
11
10
|
|
12
11
|
# See the +authorize_with+ config method for where the initialization happens.
|
@@ -28,11 +27,9 @@ module Ckeditor
|
|
28
27
|
# This takes the same arguments as +authorize+. The difference is that this will
|
29
28
|
# return a boolean whereas +authorize+ will raise an exception when not authorized.
|
30
29
|
def authorized?(action, model_object = nil)
|
31
|
-
Pundit.policy(@controller.current_user_for_pundit, model_object).public_send(action + '?'
|
30
|
+
Pundit.policy(@controller.current_user_for_pundit, model_object).public_send(action + '?') if action
|
32
31
|
end
|
33
32
|
|
34
|
-
private
|
35
|
-
|
36
33
|
module ControllerExtension
|
37
34
|
def current_user_for_pundit
|
38
35
|
# use ckeditor_current_user instead of default current_user so it works with
|
@@ -1,20 +1,15 @@
|
|
1
1
|
require 'simple_form'
|
2
2
|
|
3
|
-
module Ckeditor
|
4
|
-
|
5
|
-
|
6
|
-
|
3
|
+
module Ckeditor
|
4
|
+
module Hooks
|
5
|
+
module SimpleForm
|
6
|
+
class CkeditorInput < ::SimpleForm::Inputs::Base
|
7
|
+
def input(_wrapper_options = nil)
|
8
|
+
@builder.cktext_area(attribute_name, input_html_options)
|
9
|
+
end
|
10
|
+
end
|
7
11
|
end
|
8
12
|
end
|
9
13
|
end
|
10
14
|
|
11
|
-
::SimpleForm::FormBuilder.map_type :ckeditor, :
|
12
|
-
|
13
|
-
# TODO: remove this after a while, SimpleForm::FormBuilder#ckeditor is deprecated.
|
14
|
-
class SimpleForm::FormBuilder
|
15
|
-
def ckeditor(attribute_name, options={}, &block)
|
16
|
-
warn "[DEPRECATION] calling f.ckeditor(:#{attribute_name}, ...) is deprecated, call f.input(:#{attribute_name}, :as => :ckeditor, #{options.to_s[1..-1]}) #{Kernel.caller.first}"
|
17
|
-
options[:as] = :ckeditor
|
18
|
-
self.input(attribute_name, options, &block)
|
19
|
-
end
|
20
|
-
end
|
15
|
+
::SimpleForm::FormBuilder.map_type :ckeditor, to: Ckeditor::Hooks::SimpleForm::CkeditorInput
|
data/lib/ckeditor/http.rb
CHANGED
@@ -39,33 +39,30 @@ module Ckeditor
|
|
39
39
|
# Usage (paperclip example)
|
40
40
|
# @asset.data = QqFile.new(params[:qqfile], request)
|
41
41
|
class QqFile < ::Tempfile
|
42
|
+
attr_reader :original_filename
|
42
43
|
|
43
|
-
def initialize(filename, request, tmpdir = Dir
|
44
|
-
@original_filename
|
44
|
+
def initialize(filename, request, tmpdir = Dir.tmpdir)
|
45
|
+
@original_filename = filename
|
45
46
|
@request = request
|
46
47
|
|
47
|
-
super
|
48
|
+
super(Digest::SHA1.hexdigest(filename), tmpdir)
|
48
49
|
binmode
|
49
50
|
fetch
|
50
51
|
end
|
51
52
|
|
52
53
|
def fetch
|
53
|
-
|
54
|
-
|
54
|
+
write(body)
|
55
|
+
rewind
|
55
56
|
self
|
56
57
|
end
|
57
58
|
|
58
|
-
def original_filename
|
59
|
-
@original_filename
|
60
|
-
end
|
61
|
-
|
62
59
|
def content_type
|
63
60
|
@request.content_type
|
64
61
|
end
|
65
62
|
|
66
63
|
def body
|
67
64
|
if @request.raw_post.respond_to?(:force_encoding)
|
68
|
-
@request.raw_post.force_encoding(
|
65
|
+
@request.raw_post.force_encoding('UTF-8')
|
69
66
|
else
|
70
67
|
@request.raw_post
|
71
68
|
end
|
@@ -76,7 +73,8 @@ module Ckeditor
|
|
76
73
|
# file upload hash with UploadedFile objects
|
77
74
|
def self.normalize_param(*args)
|
78
75
|
value = args.first
|
79
|
-
|
76
|
+
|
77
|
+
if value.is_a?(Hash) && value.key?(:tempfile)
|
80
78
|
UploadedFile.new(value)
|
81
79
|
elsif value.is_a?(String)
|
82
80
|
QqFile.new(*args)
|
@@ -12,9 +12,9 @@ module Ckeditor
|
|
12
12
|
module ClassMethods
|
13
13
|
def self.extended(base)
|
14
14
|
base.class_eval do
|
15
|
-
self.table_name =
|
15
|
+
self.table_name = 'ckeditor_assets'
|
16
16
|
|
17
|
-
belongs_to :assetable, :
|
17
|
+
belongs_to :assetable, polymorphic: true
|
18
18
|
end
|
19
19
|
end
|
20
20
|
end
|
data/lib/ckeditor/orm/base.rb
CHANGED
@@ -20,7 +20,7 @@ module Ckeditor
|
|
20
20
|
end
|
21
21
|
|
22
22
|
def format_created_at
|
23
|
-
|
23
|
+
I18n.l(created_at, format: :default)
|
24
24
|
end
|
25
25
|
|
26
26
|
def url_content
|
@@ -37,11 +37,11 @@ module Ckeditor
|
|
37
37
|
|
38
38
|
def as_json(options = nil)
|
39
39
|
options = {
|
40
|
-
:
|
41
|
-
:
|
40
|
+
methods: as_json_methods,
|
41
|
+
root: 'asset'
|
42
42
|
}.merge(options || {})
|
43
43
|
|
44
|
-
super
|
44
|
+
super(options)
|
45
45
|
end
|
46
46
|
end
|
47
47
|
end
|
data/lib/ckeditor/orm/mongoid.rb
CHANGED
@@ -26,12 +26,12 @@ module Ckeditor
|
|
26
26
|
module ClassMethods
|
27
27
|
def self.extended(base)
|
28
28
|
base.class_eval do
|
29
|
-
field :data_content_type, :
|
30
|
-
field :data_file_size, :
|
31
|
-
field :width, :
|
32
|
-
field :height, :
|
29
|
+
field :data_content_type, type: String
|
30
|
+
field :data_file_size, type: Integer
|
31
|
+
field :width, type: Integer
|
32
|
+
field :height, type: Integer
|
33
33
|
|
34
|
-
belongs_to :assetable, :
|
34
|
+
belongs_to :assetable, polymorphic: true
|
35
35
|
end
|
36
36
|
end
|
37
37
|
end
|
data/lib/ckeditor/paginatable.rb
CHANGED
@@ -0,0 +1,33 @@
|
|
1
|
+
module Ckeditor
|
2
|
+
class Engine < ::Rails::Engine
|
3
|
+
isolate_namespace Ckeditor
|
4
|
+
|
5
|
+
initializer 'ckeditor.assets_precompile', group: :all do |app|
|
6
|
+
app.config.assets.precompile += Ckeditor.assets
|
7
|
+
end
|
8
|
+
|
9
|
+
initializer 'ckeditor.helpers' do
|
10
|
+
ActiveSupport.on_load(:action_controller) do
|
11
|
+
ActionController::Base.send :include, Ckeditor::Helpers::Controllers
|
12
|
+
end
|
13
|
+
|
14
|
+
ActiveSupport.on_load :action_view do
|
15
|
+
ActionView::Base.send :include, Ckeditor::Helpers::ViewHelper
|
16
|
+
ActionView::Base.send :include, Ckeditor::Helpers::FormHelper
|
17
|
+
ActionView::Helpers::FormBuilder.send :include, Ckeditor::Helpers::FormBuilder
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
initializer 'ckeditor.hooks' do
|
22
|
+
require 'ckeditor/hooks/formtastic' if Object.const_defined?('Formtastic')
|
23
|
+
require 'ckeditor/hooks/simple_form' if Object.const_defined?('SimpleForm')
|
24
|
+
|
25
|
+
require 'ckeditor/hooks/cancan' if Object.const_defined?('CanCan')
|
26
|
+
require 'ckeditor/hooks/pundit' if Object.const_defined?('Pundit')
|
27
|
+
end
|
28
|
+
|
29
|
+
rake_tasks do
|
30
|
+
load Ckeditor.root_path.join('lib/tasks/ckeditor.rake')
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
data/lib/ckeditor/text_area.rb
CHANGED
@@ -32,22 +32,22 @@ module Ckeditor
|
|
32
32
|
|
33
33
|
protected
|
34
34
|
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
35
|
+
def render(input)
|
36
|
+
output_buffer << input
|
37
|
+
output_buffer << javascript_tag(Utils.js_replace(options['id'], ck_options))
|
38
|
+
output_buffer
|
39
|
+
end
|
40
40
|
|
41
|
-
|
42
|
-
|
43
|
-
|
41
|
+
def output_buffer
|
42
|
+
@output_buffer ||= ActiveSupport::SafeBuffer.new
|
43
|
+
end
|
44
44
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
end
|
45
|
+
def build_tag(object_name, method)
|
46
|
+
if defined?(ActionView::Base::Tags::TextArea)
|
47
|
+
ActionView::Base::Tags::TextArea.new(object_name, method, template, options.symbolize_keys)
|
48
|
+
else
|
49
|
+
ActionView::Base::InstanceTag.new(object_name, method, template, options.delete('object'))
|
51
50
|
end
|
51
|
+
end
|
52
52
|
end
|
53
53
|
end
|
data/lib/ckeditor/utils.rb
CHANGED
@@ -15,7 +15,7 @@ module Ckeditor
|
|
15
15
|
return filename unless Ckeditor.parameterize_filenames
|
16
16
|
|
17
17
|
extension = File.extname(filename)
|
18
|
-
basename = filename.gsub(/#{extension}$/,
|
18
|
+
basename = filename.gsub(/#{extension}$/, '')
|
19
19
|
|
20
20
|
[basename.parameterize('_'), extension].join.downcase
|
21
21
|
end
|
@@ -30,23 +30,23 @@ module Ckeditor
|
|
30
30
|
js << "if (CKEDITOR.instances['#{dom_id}'] == undefined) { CKEDITOR.replace('#{dom_id}'); }"
|
31
31
|
end
|
32
32
|
|
33
|
-
js <<
|
34
|
-
js.join
|
33
|
+
js << '} else { setTimeout(arguments.callee, 50); } })();'
|
34
|
+
js.join.html_safe
|
35
35
|
end
|
36
36
|
|
37
37
|
def js_fileuploader(uploader_type, options = {})
|
38
|
-
options = { :
|
38
|
+
options = { multiple: true, element: 'fileupload' }.merge(options)
|
39
39
|
|
40
40
|
case uploader_type.to_s.downcase
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
41
|
+
when 'image' then
|
42
|
+
options[:action] = JavascriptCode.new('EDITOR.config.filebrowserImageUploadUrl')
|
43
|
+
options[:allowedExtensions] = Ckeditor.image_file_types
|
44
|
+
when 'flash' then
|
45
|
+
options[:action] = JavascriptCode.new('EDITOR.config.filebrowserFlashUploadUrl')
|
46
|
+
options[:allowedExtensions] = Ckeditor.flash_file_types
|
47
|
+
else
|
48
|
+
options[:action] = JavascriptCode.new('EDITOR.config.filebrowserUploadUrl')
|
49
|
+
options[:allowedExtensions] = Ckeditor.attachment_file_types
|
50
50
|
end
|
51
51
|
|
52
52
|
js_options = ActiveSupport::JSON.encode(options)
|
@@ -56,21 +56,19 @@ module Ckeditor
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def filethumb(filename)
|
59
|
-
extname = filename.blank? ?
|
59
|
+
extname = filename.blank? ? 'unknown' : File.extname(filename).gsub(/^\./, '')
|
60
60
|
image = "#{extname}.gif"
|
61
|
-
source = Ckeditor.root_path.join(
|
61
|
+
source = Ckeditor.root_path.join('app/assets/javascripts/ckeditor/filebrowser/images/thumbs')
|
62
62
|
|
63
|
-
unless File.
|
64
|
-
image = "unknown.gif"
|
65
|
-
end
|
63
|
+
image = 'unknown.gif' unless File.exist?(File.join(source, image))
|
66
64
|
|
67
|
-
File.join(Ckeditor.relative_path,
|
65
|
+
File.join(Ckeditor.relative_path, 'filebrowser/images/thumbs', image)
|
68
66
|
end
|
69
67
|
|
70
68
|
def select_assets(path, relative_path)
|
71
69
|
relative_folder = Ckeditor.root_path.join(relative_path)
|
72
70
|
folder = relative_folder.join(path)
|
73
|
-
extensions = '*.{js,css,png,gif,jpg}'
|
71
|
+
extensions = '*.{js,css,png,gif,jpg,html}'
|
74
72
|
languages = (Ckeditor.assets_languages || [])
|
75
73
|
|
76
74
|
# Files at root
|