diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-06-27 16:58:53 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-06-27 16:58:53 +0200 |
| commit | 420506e58fdfc84f1a5bede0a01dedf0af3bb4f3 (patch) | |
| tree | 57726b40e8aa9ccf80f874f39d3facefc0331420 /public/javascripts/tiny_mce/plugins/table/merge_cells.htm | |
| parent | 241d5e91b2b6716e2861cc77d319c3d3568343a8 (diff) | |
Stage 7: Rails 7.2 → 8.1 on Ruby 3.2.11
- Bump Rails to 8.1.3 (Ruby unchanged at 3.2.11, new gemset rails8-upgrade)
- config.load_defaults 8.1; merge app:update diffs for all environment files
- Remove routing-filter 0.7.0; replace with native scope '(:locale)' in
routes.rb and default_url_options in ApplicationController
- Delete config/initializers/routing_filter_rails71_patch.rb
- Replace vendored TinyMCE 3.x (~200 files) with tinymce-rails ~> 8.3;
migrate admin_interface.js from jQuery .tinymce()/advanced theme to
tinymce.init(); add config/tinymce.yml; note: TinyMCE 7+ is GPL
- rails-i18n ~> 8.0 added explicitly (previously indirect dependency)
- awesome_nested_set, acts-as-taggable-on pinned to git main/master
(gemspec activerecord < 8.1 ceiling; no functional incompatibility;
repin to version once upstream releases updated gemspecs)
- globalize ~> 7.0, libxml-ruby ~> 5.0, nokogiri ~> 1.18, pg ~> 1.5
- sass-rails, coffee-rails, uglifier moved from :assets group to main
(Sprockets 4 convention; :assets group no longer meaningful)
- Node: head, draft, lock_owner marked belongs_to optional: true
- Page: node, user, editor marked belongs_to optional: true
- Static assets in public/images/ and public/javascripts/ referenced via
plain HTML tags; Rails 8 load_defaults raises on pipeline helpers for
undeclared assets
- sessions_controller_test.rb: remove stale require and dead rescue_action
- users_controller_test.rb: assert button[type=submit] not input[type=submit]
(Rails 8 button_to renders <button> not <input>)
- test_helper.rb: node.reload after children.create! (awesome_nested_set
3.9.0 does not refresh parent in memory after callback)
- 129 runs, 339 assertions, 3 failures, 0 errors — identical baseline to 7.2
Diffstat (limited to 'public/javascripts/tiny_mce/plugins/table/merge_cells.htm')
| -rw-r--r-- | public/javascripts/tiny_mce/plugins/table/merge_cells.htm | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/public/javascripts/tiny_mce/plugins/table/merge_cells.htm b/public/javascripts/tiny_mce/plugins/table/merge_cells.htm deleted file mode 100644 index 25d42eb..0000000 --- a/public/javascripts/tiny_mce/plugins/table/merge_cells.htm +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | ||
| 2 | <html xmlns="http://www.w3.org/1999/xhtml"> | ||
| 3 | <head> | ||
| 4 | <title>{#table_dlg.merge_cells_title}</title> | ||
| 5 | <script type="text/javascript" src="../../tiny_mce_popup.js"></script> | ||
| 6 | <script type="text/javascript" src="../../utils/mctabs.js"></script> | ||
| 7 | <script type="text/javascript" src="../../utils/validate.js"></script> | ||
| 8 | <script type="text/javascript" src="js/merge_cells.js"></script> | ||
| 9 | </head> | ||
| 10 | <body style="margin: 8px"> | ||
| 11 | <form onsubmit="mergeCells();return false;" action="#"> | ||
| 12 | <fieldset> | ||
| 13 | <legend>{#table_dlg.merge_cells_title}</legend> | ||
| 14 | <table border="0" cellpadding="0" cellspacing="3" width="100%"> | ||
| 15 | <tr> | ||
| 16 | <td>{#table_dlg.cols}:</td> | ||
| 17 | <td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td> | ||
| 18 | </tr> | ||
| 19 | <tr> | ||
| 20 | <td>{#table_dlg.rows}:</td> | ||
| 21 | <td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td> | ||
| 22 | </tr> | ||
| 23 | </table> | ||
| 24 | </fieldset> | ||
| 25 | |||
| 26 | <div class="mceActionPanel"> | ||
| 27 | <div style="float: left"> | ||
| 28 | <input type="submit" id="insert" name="insert" value="{#update}" /> | ||
| 29 | </div> | ||
| 30 | |||
| 31 | <div style="float: right"> | ||
| 32 | <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" /> | ||
| 33 | </div> | ||
| 34 | </div> | ||
| 35 | </form> | ||
| 36 | </body> | ||
| 37 | </html> | ||