Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 236301 Details for
Bug 418862
Compare with... should give some indication if the two things are identical
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
Patch file
patch418862.txt (text/plain), 5.08 KB, created by
libing wang
on 2013-10-09 16:06:25 EDT
(
hide
)
Description:
Patch file
Filename:
MIME Type:
Creator:
libing wang
Created:
2013-10-09 16:06:25 EDT
Size:
5.08 KB
patch
obsolete
>diff --git a/bundles/org.eclipse.orion.client.ui/web/compare-tree/compare-tree.html b/bundles/org.eclipse.orion.client.ui/web/compare-tree/compare-tree.html >index 18d9bac..9f7c6c4 100644 >--- a/bundles/org.eclipse.orion.client.ui/web/compare-tree/compare-tree.html >+++ b/bundles/org.eclipse.orion.client.ui/web/compare-tree/compare-tree.html >@@ -4,11 +4,12 @@ > <meta name="copyright" content="Copyright (c) IBM Corporation and others 2010." > > <meta http-equiv="Content-Language" content="en-us"> > <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> >- <title>Compare Tree</title> >- <link rel="stylesheet" type="text/css" href="compare-tree.css" /> >+ <title>Compare Tree</title> >+ <link rel="stylesheet" type="text/css" href="compare-tree.css" /> > <link rel="shortcut icon" href="/replaceAll.ico" /> >- <script type="text/javascript" src="../requirejs/require.js"></script> >+ <script src="../requirejs/require.js"></script> > <script type="text/javascript"> >+ /*global require*/ > require({ > baseUrl: '..', > paths: { >@@ -20,25 +21,16 @@ > > require(["compare-tree.js"]); > </script> >- >- </head> >- >- <body id="orion-compare-tree" class="orionPage"> >+ </head> >+ <body id="orion-compare-tree" class="orionPage"> > <div class="content-fixedHeight"> >- <div id="outlineContainer" class="auxpane sidePanelLayout hasSplit"> >- <div class="sidePanelMargins" id="searchProgress"></div> >- </div> >- <div class="split splitLayout"></div> >- <div id="rightPane" class="mainpane mainPanelLayout hasSplit"> >- <div class="fixedToolbarHolder"> >- <div class="mainToolbar toolComposite" id="pageToolbar"></div> >- <div class="toolbarTarget" tabindex="0"> >- <div class="mainpane" id="compare-tree-results" tabindex="0" style="height:100%;width:100%;position:relative;"> >- </div> >- </div> >+ <div class="fixedToolbarHolder mainpane mainPanelLayout"> >+ <div class="mainToolbar toolComposite" id="pageToolbar"></div> >+ <div id="compare-tree-results" class="toolbarTarget"> > </div> > </div> > </div> >- <div class="footer-fixed-bottom footer" id="footer"></div> >- </body> >+ <div class="footer-fixed-bottom footer" id="footer"> >+ </div> >+ </body> > </html> >diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js >index 0455772..69f60dd 100644 >--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js >+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/compareTreeExplorer.js >@@ -12,9 +12,9 @@ > /*global define document console window*/ > /*jslint forin:true regexp:false sub:true*/ > >-define(['i18n!orion/compare/nls/messages', 'require', 'orion/webui/littlelib', 'orion/explorers/explorer', 'orion/explorers/explorerNavHandler', 'orion/fileClient', 'orion/commandRegistry', >+define(['i18n!orion/compare/nls/messages', 'require', 'orion/webui/littlelib', 'orion/i18nUtil', 'orion/explorers/explorer', 'orion/explorers/explorerNavHandler', 'orion/fileClient', 'orion/commandRegistry', > 'orion/explorers/navigationUtils', 'orion/crawler/searchCrawler', 'orion/compare/compareUtils', 'orion/searchUtils', 'orion/selection'], >- function(messages, require, lib, mExplorer, mNavHandler, mFileClient, mCommands, mNavUtils, mSearchCrawler, mCompareUtils, mSearchUtils, mSelection) { >+ function(messages, require, lib, i18nUtil, mExplorer, mNavHandler, mFileClient, mCommands, mNavUtils, mSearchCrawler, mCompareUtils, mSearchUtils, mSelection) { > > function _empty(nodeToEmpty){ > var node = lib.node(nodeToEmpty); >@@ -230,6 +230,12 @@ > var that = this; > if(this._compareResults.length > 0){ > this._loadOneFileMetaData(0,function(){that._renderUI(); that._addOptions();}); >+ } else { >+ var message = i18nUtil.formatMessage(messages["${0} files compared. The two folders are identical."], this._totalFiles); >+ var parentNode = lib.node(this.parentId); >+ parentNode.textContent = ""; >+ var textBold = _createElement('b', null, null, parentNode); //$NON-NLS-1$ //$NON-NLS-0$ >+ _place(document.createTextNode(message), textBold, "only"); //$NON-NLS-0$ > } > console.log("completed compare"); //$NON-NLS-0$ > this.reportStatus(""); >diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js >index d61d322..cdaa072 100644 >--- a/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js >+++ b/bundles/org.eclipse.orion.client.ui/web/orion/compare/nls/root/messages.js >@@ -35,5 +35,6 @@ > "Options": "Options", > "Sort by folders": "Sort by folders", > "Line 0 : Col 0": "Line 0 : Col 0", >- "No Matching DiffService for location:": "No Matching DiffService for location:" >+ "No Matching DiffService for location:": "No Matching DiffService for location:", >+ "${0} files compared. The two folders are identical.": "${0} files compared. The two folders are identical." > }); >\ No newline at end of file
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 418862
:
236193
| 236301