| 1 |
85ad3d82
|
Assos Assos
|
|
| 2 |
|
|
CHANGELOG for Diff 7.x-2.0+13-dev to 7.x-3.x
|
| 3 |
|
|
============================================
|
| 4 |
|
|
|
| 5 |
|
|
1) System variable names have been changed
|
| 6 |
|
|
------------------------------------------
|
| 7 |
|
|
|
| 8 |
|
|
Considerable changes have occurred.
|
| 9 |
|
|
|
| 10 |
|
|
2) hook_diff() was removed
|
| 11 |
|
|
--------------------------
|
| 12 |
|
|
|
| 13 |
|
|
This has been replaced by hook_entity_diff() as of Diff 7.x-3.x.
|
| 14 |
|
|
|
| 15 |
|
|
3) Field diffs are handled independently by Diff and the field module
|
| 16 |
|
|
---------------------------------------------------------------------
|
| 17 |
|
|
|
| 18 |
|
|
Field modules SHOULD NOT implement hook_entity_diff().
|
| 19 |
|
|
|
| 20 |
|
|
This is complicated and costly in terms of performance.
|
| 21 |
|
|
|
| 22 |
|
|
Two new field callbacks are defined to handle these.
|
| 23 |
|
|
|
| 24 |
|
|
a) MODULE_field_diff_view_prepare()
|
| 25 |
|
|
|
| 26 |
|
|
Optional: If you need to load data, use MODULE_field_diff_view_prepare().
|
| 27 |
|
|
|
| 28 |
|
|
b) MODULE_field_diff_view()
|
| 29 |
|
|
|
| 30 |
|
|
Recommended: You should implement this to generate the compared data.
|
| 31 |
|
|
|
| 32 |
|
|
If there is no corresponding hook for a field, the field comparison will try
|
| 33 |
|
|
to guess the value using $item['safe_value'] or $item['value'] properties.
|
| 34 |
|
|
|
| 35 |
|
|
If you need to make this configurable, there are two additional hooks:
|
| 36 |
|
|
|
| 37 |
|
|
c) MODULE_field_diff_default_options($field_type)
|
| 38 |
|
|
|
| 39 |
|
|
You should define any additioal settings here. This shares a global namespace
|
| 40 |
|
|
of the diff module, so you can overwrite core Diff settings here too.
|
| 41 |
|
|
|
| 42 |
|
|
In saying that, take care not to accidentially do this.
|
| 43 |
|
|
|
| 44 |
|
|
d) MODULE_field_diff_options_form($field_type, $settings)
|
| 45 |
|
|
|
| 46 |
|
|
This is where you insert Form API elements to configure your option settings.
|
| 47 |
|
|
|
| 48 |
|
|
4) Field diffs are now configurable
|
| 49 |
|
|
-----------------------------------
|
| 50 |
|
|
|
| 51 |
|
|
Each field type defined by core have configurable settings to control the
|
| 52 |
|
|
rendering of the comparison.
|
| 53 |
|
|
|
| 54 |
|
|
a) Global configuration
|
| 55 |
|
|
|
| 56 |
|
|
An administration page has been added to handle field type default settings.
|
| 57 |
|
|
|
| 58 |
|
|
This is the preferred way to configure field settings are these are global to
|
| 59 |
|
|
all fields of this type.
|
| 60 |
|
|
|
| 61 |
|
|
b) View mode display options
|
| 62 |
|
|
|
| 63 |
|
|
The display "Diff comparison" is used to control the fields that are displayed
|
| 64 |
|
|
when comparing different revisions.
|
| 65 |
|
|
|
| 66 |
|
|
The following is a walk-through on how you would configure the Basic page
|
| 67 |
|
|
(page) content types field configuration.
|
| 68 |
|
|
|
| 69 |
|
|
- Enable "Diff comparison" custom view mode
|
| 70 |
|
|
|
| 71 |
|
|
Navigate to admin/structure/types/manage/page/display and look at the
|
| 72 |
|
|
Custom Display Settings for this view mode. Check and save.
|
| 73 |
|
|
|
| 74 |
|
|
- Configure the display
|
| 75 |
|
|
|
| 76 |
|
|
After Saving this page, a new tab appears "Diff comparison", click this or
|
| 77 |
|
|
navigate directly to admin/structure/types/manage/page/display/diff_standard
|
| 78 |
|
|
|
| 79 |
|
|
- You can hide or show the fields that you want to display when doing
|
| 80 |
|
|
comparisons.
|
| 81 |
|
|
- If the field has no inbuilt diff support, then the renderred field items
|
| 82 |
|
|
will be compared.
|
| 83 |
|
|
|
| 84 |
|
|
5) Standard comparison preview / Inline diff view setting
|
| 85 |
|
|
---------------------------------------------------------
|
| 86 |
|
|
|
| 87 |
|
|
You can set the view modes used to compare the rendered node. This can be found
|
| 88 |
|
|
in the Diff settings in the Content Type settings page.
|
| 89 |
|
|
|
| 90 |
|
|
6) Optional CSS and new Boxes styles
|
| 91 |
|
|
------------------------------------
|
| 92 |
|
|
|
| 93 |
|
|
This takes the styles from WikiPedia to really spice up the diff page.
|
| 94 |
|
|
|
| 95 |
|
|
7) Optional JScript extras
|
| 96 |
|
|
--------------------------
|
| 97 |
|
|
|
| 98 |
|
|
This spices up the revision checkboxes on the revisions page.
|
| 99 |
|
|
|
| 100 |
|
|
8) Simple past revision token support
|
| 101 |
|
|
-------------------------------------
|
| 102 |
|
|
|
| 103 |
|
|
Use-case, email notifications when content has changes. If these support tokens,
|
| 104 |
|
|
then you can embed Diffs into these emails.
|
| 105 |
|
|
|
| 106 |
|
|
9) Extensive string review
|
| 107 |
|
|
--------------------------
|
| 108 |
|
|
See http://drupal.org/node/1785742
|
| 109 |
|
|
|
| 110 |
|
|
|
| 111 |
|
|
10) Inline block settings changes
|
| 112 |
|
|
---------------------------------
|
| 113 |
|
|
The inline block settings are now in the block configuration page.
|
| 114 |
|
|
|
| 115 |
|
|
11) And much more...
|
| 116 |
|
|
--------------------
|
| 117 |
|
|
|
| 118 |
|
|
The complete change log follows:
|
| 119 |
|
|
|
| 120 |
|
|
Diff 7.x-2.x
|
| 121 |
|
|
o #888680 by Deciphered, Alan D.: Allow modules to interact via drupal_alter()
|
| 122 |
|
|
o #1280892 by Alan D., crea: Diff should track the variables that it defines
|
| 123 |
|
|
o #1304658 by Alan D., kari.kaariainen: Remove links and comments from the comparison preview
|
| 124 |
|
|
o #1122206 by binford2k, Alan D.: Notices thrown by DiffEngine::process_chunk()
|
| 125 |
|
|
o #1175064 by zilverdistel, Alan D.: Provide variables for leading and trailing context
|
| 126 |
|
|
o #1673864 by Alan D.: Allow users to bypass the admin theme when viewing comparisons
|
| 127 |
|
|
o #1673876 by Alan D.: Use Drupal autoloading for classes
|
| 128 |
|
|
o #1673856 by Alan D.: Use hook_form_BASE_FORM_ID_alter() rather than hook_form_alter()
|
| 129 |
|
|
o #1673856 by Alan D.: Normalise line endings
|
| 130 |
|
|
o #114308 by Alan D.: add jQuery for hiding radios that shouldn't show diffs
|
| 131 |
|
|
o #1688840 by Alan D.: Enable new JScript behaviour by default
|
| 132 |
|
|
o #372957 by erykmynn, JuliaKM, lsrzj, andrew_rs, alexpott, et al: HTML Strip for Diff, WYSIWYG Friendly
|
| 133 |
|
|
(This was refactored in the 7.x-3.x branch from the commited 7.x-2.x code)
|
| 134 |
|
|
o #521212 by Alan D., blakehall: Make diff comparison page themable
|
| 135 |
|
|
o #1671484 by Alan D.: Show number of lines changed on revisions page
|
| 136 |
|
|
o #114699 by smokris, Alan D.: Diff module should support Token
|
| 137 |
|
|
o #372957 by c31ck: display either Hide or Show based on what clicking it will do at any time (HTML Strip for Diff)
|
| 138 |
|
|
This was altered for the 7.x-3.x branch.
|
| 139 |
|
|
o #1807510 & #1825202: Simplify Diff administration
|
| 140 |
|
|
o #1812162 by mitchell, Alan D.: 'Highlight changes' block appears on edit form
|
| 141 |
|
|
|
| 142 |
|
|
Node to Entity changes
|
| 143 |
|
|
----------------------
|
| 144 |
|
|
These are roughly tracked in the meta issue #1365750 Generalize API and Integrate with core field types
|
| 145 |
|
|
|
| 146 |
|
|
o (no issue) by Alan D.: Use entity specific system variables.
|
| 147 |
|
|
o (no issue) by Alan D.: View mode code, new hooks, new API. Massive patch!
|
| 148 |
|
|
|
| 149 |
|
|
Resolves:
|
| 150 |
|
|
o #248778: Taxonomy diff
|
| 151 |
|
|
o #1550698: Diff of "select from list" fields shows change in key, not change in value
|
| 152 |
|
|
o #1458814: File (and image) field support
|
| 153 |
|
|
o #1418760: Optional setting to honour the display settings
|
| 154 |
|
|
o #1347316: Selectable view mode for inline diffs and "Current revision" display view mode
|
| 155 |
|
|
o #1458906: Improve performances (of existing 7.x-2.x field rendering)
|
| 156 |
|
|
o #1424162: Diff in Taxonomy term description
|
| 157 |
|
|
o #1211282: Image diff support
|
| 158 |
|
|
|
| 159 |
|
|
The following patches will be posted in the corresponding project queues once
|
| 160 |
|
|
the 7.x-3.x branch is released:
|
| 161 |
|
|
o #1595702 by Alan D., mbilbille: Support of field collection module
|
| 162 |
|
|
o #1350604 by Alan D., johaziel: Datetime diff
|
| 163 |
|
|
o (no issue) by Alan D.: Email field Diff support
|
| 164 |
|
|
o (no issue) by Alan D.: Countries Diff support
|
| 165 |
|
|
o (no issue) by Alan D.: Name field Diff support
|
| 166 |
|
|
o (no issue) by Alan D.: Link field Diff support |
