? ? Pending

User tests: Successful: Unsuccessful:

avatar C-Lodder
C-Lodder
14 Mar 2017

Pull Request for Issue #14592

Also means #14611 should be merged.

Summary of Changes

This PR introduces a vanilla JS diff script for the content version component, with some HTML5 fixes and other improvements to make the view more simplistic.

Testing Instructions

  • Apply PR
  • Ensure you have content versioning enabled
  • Update any article
  • Click "Versions" in the toolbar
  • Select 2 articles and click "Compare"

screeny

avatar C-Lodder C-Lodder - open - 14 Mar 2017
avatar C-Lodder C-Lodder - change - 14 Mar 2017
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 14 Mar 2017
Category JavaScript Administration com_content com_contenthistory Language & Strings Templates (admin)
avatar C-Lodder C-Lodder - edited - 14 Mar 2017
avatar brianteeman
brianteeman - comment - 14 Mar 2017

do we still have the triple column view?

On 14 March 2017 at 15:33, Lodder notifications@github.com wrote:

Pull Request for Issue #14592
#14592

Also means #14611 #14611
should be merged.
Summary of Changes

This PR introduces a vanilla JS diff script for the content version
component, with some HTML5 fixes and other improvements to make the view
more simplistic.
Testing Instructions

  • Apply PR
  • Ensure you have content versioning enabled
  • Update any article
  • Click "Versions" in the toolbar
  • Select 2 articles and click "Compare"

[image: screeny]
https://cloud.githubusercontent.com/assets/2019801/23908282/781636ec-08cb-11e7-957f-8a9ecf0c7fb8.png

You can view, comment on, or merge this pull request online at:

#14613
Commit Summary

  • Styling/JS tweaks + PHPCS
  • Replace old diff script
  • remove old JHtml file + add language strings

File Changes

Patch Links:


You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#14613, or mute the thread
https://github.com/notifications/unsubscribe-auth/ABPH8UrzwCsr9VRUqgjsgmDRBYGpI9EWks5rlrNIgaJpZM4Mcvnj
.

--
Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
https://brian.teeman.net/ http://brian.teeman.net/

avatar C-Lodder
C-Lodder - comment - 14 Mar 2017

@brianteeman - No. I tried to make the compare a little bit more similar to Github, bu which it shows the original/diff

avatar brianteeman
brianteeman - comment - 14 Mar 2017

:(

avatar C-Lodder
C-Lodder - comment - 14 Mar 2017

suppose I can add it back in if you think it beneficial.

avatar brianteeman
brianteeman - comment - 14 Mar 2017

Personally I think it is better to have that for the non-developer user. Also the same is true for the ability to compare just the changed values and with and without thew html

avatar zero-24
zero-24 - comment - 14 Mar 2017

You are changing over 130 files? Looks like something is broken?

avatar C-Lodder
C-Lodder - comment - 14 Mar 2017

@zero-24 - I'm waiting for #14575 to be merged. It's not an issue, it's simply the gruntfile.js minifying the JS files

avatar C-Lodder C-Lodder - change - 14 Mar 2017
Title
Replace Diff script
[4.0] Replace JS Diff script
Labels Added: ? ?
avatar dgt41
dgt41 - comment - 14 Mar 2017

@C-Lodder @zero-24 we might have to rethink the workflow for the scripts here, as uglify returns always different results (assigning variables to different letters)...
Or get another script that will produce consistent results

avatar C-Lodder
C-Lodder - comment - 14 Mar 2017

@dgt41 - Why don't we just set mangle to false, which will prevent the variable and function names from changing?

avatar dgt41
dgt41 - comment - 14 Mar 2017

add this

			options: {
				compress: true,
				mangle: false
			},

before allJs

avatar dgt41
dgt41 - comment - 14 Mar 2017

and for the build script we will do the same but with mangle=true

avatar C-Lodder
C-Lodder - comment - 15 Mar 2017

@brianteeman - re-added the other column.

avatar joomla-cms-bot joomla-cms-bot - change - 18 Mar 2017
Category JavaScript Administration com_content com_contenthistory Language & Strings Templates (admin) JavaScript Administration com_content com_contenthistory Language & Strings
avatar wilsonge wilsonge - change - 18 Mar 2017
Status Pending Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2017-03-18 09:07:53
Closed_By wilsonge
avatar wilsonge wilsonge - close - 18 Mar 2017
avatar wilsonge wilsonge - merge - 18 Mar 2017

Add a Comment

Login with GitHub to post a comment