add zoom ruler to editor demo.htmlorigin/stable_20141007

4 files changed, 21 insertions, 1 deletions

diff --git a/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.html b/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.html
index 6b0ed15..947bb96 100644
--- a/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.html
+++ b/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.html
@@ -136,6 +136,10 @@
 				<label for="marginOffset">Show Margin</label>
 			</div>
 			<div>
+				<input type="checkbox" checked="checked" id="zoomRuler">
+				<label for="zoomRuler">Show Zoom Ruler</label>
+			</div>
+			<div>
 				<input type="checkbox" id="marginRuler">
 				<label for="marginRuler">Show Margin Ruler</label>
 			</div>
diff --git a/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.js b/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.js
index 2688e29..6732fff 100644
--- a/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.js
+++ b/bundles/org.eclipse.orion.client.editor/web/examples/editor/demo.js
@@ -39,6 +39,7 @@ function(mSetup, mTestPerformance, util) {
 	var bFullSel = document.getElementById('fullSelection'); //$NON-NLS-0$
 	var bWrap = document.getElementById('wrap'); //$NON-NLS-0$
 	var bMarginRuler = document.getElementById('marginRuler'); //$NON-NLS-0$
+	var bZoomRuler = document.getElementById('zoomRuler'); //$NON-NLS-0$
 	var sMarginOffset = document.getElementById('marginOffset'); //$NON-NLS-0$
 	var sWrapOffset = document.getElementById('wrapOffset'); //$NON-NLS-0$
 	var bExpandTab = document.getElementById('expandTab'); //$NON-NLS-0$
@@ -47,6 +48,7 @@ function(mSetup, mTestPerformance, util) {
 	
 	var keyBindings = "";
 	var showMarginRuler = false;
+	var showZoomRuler = true;
 
 	function resize() {
 		var height = document.documentElement.clientHeight;
@@ -96,6 +98,7 @@ function(mSetup, mTestPerformance, util) {
 			wrapMode: bWrap.checked,
 			keyBindings: (keyBindings = sBindings.value),
 			showMarginRuler: (showMarginRuler = bMarginRuler.checked),
+			showZoomRuler: (showZoomRuler = bZoomRuler.checked),
 			marginOffset: parseInt(sMarginOffset.value, 10),
 			wrapOffset: parseInt(sWrapOffset.value, 10),
 			themeClass: sTheme.value
@@ -109,6 +112,7 @@ function(mSetup, mTestPerformance, util) {
 		bFullSel.checked = options.fullSelection;
 		bWrap.checked = options.wrapMode;
 		bMarginRuler.checked = showMarginRuler;
+		bZoomRuler.checked = showZoomRuler;
 		sWrapOffset.value = options.wrapOffset;
 		sMarginOffset.value = options.marginOffset;
 		bExpandTab.checked = options.expandTab;
@@ -198,6 +202,7 @@ function(mSetup, mTestPerformance, util) {
 	bFullSel.onchange = checkSetOptions;
 	bWrap.onchange = checkSetOptions;
 	bMarginRuler.onchange = checkSetOptions;
+	bZoomRuler.onchange = checkSetOptions;
 	sMarginOffset.onchange = checkSetOptions;
 	sWrapOffset.onchange = checkSetOptions;
 	bExpandTab.onchange = checkSetOptions;
diff --git a/bundles/org.eclipse.orion.client.editor/web/examples/editor/demoSetup.js b/bundles/org.eclipse.orion.client.editor/web/examples/editor/demoSetup.js
index 63c9f5b..729a616 100644
--- a/bundles/org.eclipse.orion.client.editor/web/examples/editor/demoSetup.js
+++ b/bundles/org.eclipse.orion.client.editor/web/examples/editor/demoSetup.js
@@ -63,6 +63,13 @@ define(["require",
 		}
 	}
 	
+	function updateZoomRuler(view, options) {
+		view.removeRuler(view.zoomRuler);
+		if (options.showZoomRuler) {
+			view.addRuler(view.zoomRuler);
+		}
+	}
+	
 	function updateKeyMode(view, options) {
 		view.removeKeyMode(vi);
 		view.removeKeyMode(emacs);
@@ -80,6 +87,7 @@ define(["require",
 				view.setOptions(options);
 				updateKeyMode(view, options);
 				updateMarginRuler(view, options);
+				updateZoomRuler(view, options);
 			}
 			return view;
 		}
@@ -214,6 +222,8 @@ define(["require",
 		view.addRuler(linesRuler);
 		
 		view.marginLines = new mRulers.LineNumberRuler(annotationModel, "margin", {styleClass: "ruler lines"}, {styleClass: "rulerLines odd"}, {styleClass: "rulerLines even"}); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+
+		view.zoomRuler = new mRulers.ZoomRuler("innerRight", {styleClass: "ruler zoom"}); //$NON-NLS-1$ //$NON-NLS-0$
 		
 		if (foldingEnabled) {
 			var foldingRuler = view.folding = new mRulers.FoldingRuler(annotationModel, "left", {styleClass: "ruler folding"}); //$NON-NLS-1$ //$NON-NLS-0$
@@ -222,6 +232,7 @@ define(["require",
 		}
 		view.addRuler(overviewRuler);
 		updateMarginRuler(view, options);
+		updateZoomRuler(view, options);
 		return view;
 	}
 	exports.checkView = checkView;
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
index cb343b2..24bbb4d 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
@@ -1518,7 +1518,7 @@ define("orion/editor/textView", [ //$NON-NLS-0$
 		 * @see orion.editor.TextView#setTopPixel
 		 */
 		convert: function(rect, from, to) {
-			if (!this._clientDiv) { return; }
+			if (!this._clientDiv) { return rect; }
 			var scroll = this._getScroll();
 			var viewPad = this._getViewPadding();
 			var viewRect = this._viewDiv.getBoundingClientRect();