| Summary: | Compare view does not work for files without content type provided | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Szymon Brandys <Szymon.Brandys> |
| Component: | Client | Assignee: | libing wang <libingw> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | major | ||
| Priority: | P3 | CC: | ken_walker, mamacdon, simon_kaegi |
| Version: | 2.0 | Flags: | mamacdon:
review+
simon_kaegi: review+ |
| Target Milestone: | 2.0 RC3 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
The meta data for a file is needed to render the tile. Not sure why it would block the whole widget. If meta data is not available, the raw file URL will be rendered. E.g. when you compare a commit in commit page, the meta is not provided so the file URL is rendered on both side as tiles. Waiting for the URL that Szymon will give me to investigate what happened. Talked to Szymon on ST today. He had problems with the instance to test... Simon talked to me regarding this remaining bug for RC2. Tomorrow will be the testing day so he suggested me to move it to RC3. Once Szymon's test instance is up, we will resolve it right away. reviewed fixed with http://git.eclipse.org/c/orion/org.eclipse.orion.client.git/commit/?id=61b05321ad2bec0be8121e818b61ddfb607c7a45. I've changed the abstraction. The bug has nothing to do with meta data. We assumed all the fileURLs can be provided file types but actually not. So if the results returned from the file content type provider is not defined, we will just skip the syntax highlighter. I was kind of able to reproduce the similar case where two files without extensions are compared. In this simulation, I hit the issue. The results returned two items but each of them is null. Szymon, lease pull the latest and test in your case. But for my curiosity, I just do not under stand why your file urls can't be found file types? Just talked to Szymon on same time after he came back. He verified that fix resolved his issue. His file URL does not have extension so the fix is right for that case. |
My diffUri returns just the old resource state and moreover I have no way to get this resource metadata. I would need code like this in compare-container.js _resolveTwoFiles: function(baseFileURL, newFileURL, errorCallback){ var that = this; var compareTwo = function(results) { if (results){ .... then do regular stuff return; } that.callBack({ baseFile:{URL: baseFileURL, Name: "", Type: ""}, newFile:{URL: newFileURL, Name: "", Type: ""}, diff: that._diffContent }); }; Thanks.