Revert "Bug 383541 - When not integrating the Fontformating Arrays (Fontsize, -style etc.) the selectionChange did not fire properly"

This reverts commit 21594c594c220bcbff7efaf22edb9710d1f22368.

3 files changed, 33 insertions, 49 deletions

diff --git a/org.eclipse.mylyn.htmltext-feature/feature.xml b/org.eclipse.mylyn.htmltext-feature/feature.xml
index cee9273bd..9f75e6581 100644
--- a/org.eclipse.mylyn.htmltext-feature/feature.xml
+++ b/org.eclipse.mylyn.htmltext-feature/feature.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (c) 2011 Tasktop Techonologies and others.
     All rights reserved. This program and the accompanying materials
@@ -8,30 +8,30 @@
     
     Contributors:
         Tasktop Techonologies - initial API and implementation
- -->

-<feature

-      id="org.eclipse.mylyn.htmltext"

-      label="%featureName"

-      version="1.1.1.qualifier"

-      provider-name="%providerName"

-      plugin="org.eclipse.mylyn.htmltext.ui">

-

-   <description>

-      %description

-   </description>

-

-   <copyright>

-      %copyright

-   </copyright>

-

-   <license url="license.html">

-      %license

-   </license>

-

-   <plugin

-         id="org.eclipse.mylyn.htmltext.ui"

-         download-size="0"

-         install-size="0"

-         version="0.0.0"/>

-

-</feature>

+ -->
+<feature
+      id="org.eclipse.mylyn.htmltext"
+      label="%featureName"
+      version="1.1.0.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.mylyn.htmltext.ui">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="license.html">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.mylyn.htmltext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/org.eclipse.mylyn.htmltext.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.htmltext.ui/META-INF/MANIFEST.MF
index bece5f262..9f7f0fcf3 100644
--- a/org.eclipse.mylyn.htmltext.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.htmltext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.htmltext.ui
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.mylyn.htmltext.HtmlTextActivator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js b/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js
index 01a1ca3fc..cdb9af710 100644
--- a/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js
+++ b/org.eclipse.mylyn.htmltext.ui/eclipsebridge/format.js
@@ -62,20 +62,12 @@ EclipseStyles.prototype.init = function(editor) {
 		{
 			if ( thisInstance.styles[ tag ].checkActive( elementPath ) )
 			{
-				try {
-					_delegate_selectedformat(tag);
-				} catch(e) {
-					// skip
-				}
+				_delegate_selectedformat(tag);
 				return;
 			}
 		}
 		// If no styles match, just empty it.
-		try {
-			_delegate_selectedformat('');	
-		} catch (e) {
-			//skip
-		}
+		_delegate_selectedformat('');
 	
 	});
 	this.editor.on( 'selectionChange', function( ev )
@@ -85,20 +77,12 @@ EclipseStyles.prototype.init = function(editor) {
 		{
 			if ( thisInstance.sizes[ tag ].checkActive( elementPath ) )
 			{
-				try {
-					_delegate_selectedsize(thisInstance.plainSizes[ tag ]);
-				} catch (e) {
-					// skip
-				}
+				_delegate_selectedsize(thisInstance.plainSizes[ tag ]);
 				return;
 			}
 		}
 		// If no styles match, send -1
-		try {
-			_delegate_selectedsize(-1);
-		} catch(e) {
-			// skip
-		}
+		_delegate_selectedsize(-1);
 		
 	});
 	this.editor.on( 'selectionChange', function( ev )