[Tynstep-svn] r194 - in trunk/step: step-build step-core step-core/src/main/java/com/tyndalehouse/step/core/utils step-parent step-server step-web step-web/src/main/webapp/css step-web/src/main/webapp/js

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2010-12-03 12:26:36 -0700 (Fri, 03 Dec 2010)
New Revision: 194

Modified:
   trunk/step/step-build/
   trunk/step/step-core/
   trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/XslHelper.java
   trunk/step/step-parent/
   trunk/step/step-server/
   trunk/step/step-web/
   trunk/step/step-web/src/main/webapp/css/initial-layout.css
   trunk/step/step-web/src/main/webapp/js/ui_hooks.js
Log:
updates to make links on UI to work


Property changes on: trunk/step/step-build
___________________________________________________________________
Added: svn:ignore
   + .checkstyle
.checkstyle.config.xml
.classpath
.fbprefs
.pmd
.project
.settings
target



Property changes on: trunk/step/step-core
___________________________________________________________________
Added: svn:ignore
   + .checkstyle
.checkstyle.config.xml
.classpath
.fbprefs
.pmd
.project
.settings
target


Modified: trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/XslHelper.java
===================================================================
--- trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/XslHelper.java	2010-12-02 23:19:41 UTC (rev 193)
+++ trunk/step/step-core/src/main/java/com/tyndalehouse/step/core/utils/XslHelper.java	2010-12-03 19:26:36 UTC (rev 194)
@@ -9,7 +9,7 @@
     private static final int APPROXIMATE_SPAN_LENGTH = 46;
     private static final String START_ANCHOR = "<a href=\"";
     private static final String START_FUNCTION_WRAPPER = "('";
-    private static final String END_FUNCTION_WRAPPER = "')";
+    private static final String END_FUNCTION_WRAPPER = "', this)";
     private static final String QUOTED_END_TAG = "\">";
     private static final String END_ANCHOR = "</a>";
     private static final String SEPARATORS = " |";


Property changes on: trunk/step/step-parent
___________________________________________________________________
Added: svn:ignore
   + .project
.settings



Property changes on: trunk/step/step-server
___________________________________________________________________
Added: svn:ignore
   + .checkstyle
.checkstyle.config.xml
.classpath
.fbprefs
.pmd
.project
.settings
target



Property changes on: trunk/step/step-web
___________________________________________________________________
Added: svn:ignore
   + .checkstyle
.checkstyle.config.xml
.classpath
.fbprefs
.pmd
.project
.settings
bin
target


Modified: trunk/step/step-web/src/main/webapp/css/initial-layout.css
===================================================================
--- trunk/step/step-web/src/main/webapp/css/initial-layout.css	2010-12-02 23:19:41 UTC (rev 193)
+++ trunk/step/step-web/src/main/webapp/css/initial-layout.css	2010-12-03 19:26:36 UTC (rev 194)
@@ -54,6 +54,10 @@
 	padding-botom: 5px;
 }
 
+#leftPassagePane, #rightPassagePane {
+	white-space: nowrap;
+}
+
 .passageVersion {
 	width: 40%;
 }

Modified: trunk/step/step-web/src/main/webapp/js/ui_hooks.js
===================================================================
--- trunk/step/step-web/src/main/webapp/js/ui_hooks.js	2010-12-02 23:19:41 UTC (rev 193)
+++ trunk/step/step-web/src/main/webapp/js/ui_hooks.js	2010-12-03 19:26:36 UTC (rev 194)
@@ -15,20 +15,25 @@
  * Called when clicking on a strong link
  * @param strong strong to be displayed
  */
-function showStrong(strong) {
-	$.shout("show-strong", strong);
-	
-	//need to find what event is coming in, to get the clicked element and pass that down
-	
-	//invoke show-all-strong-morphs first, for all 
-	
-	//select span containing text <strong>, then get its parent and invoke click() on it. 
+function showStrong(strong, sourceElement) {
+	showMorphOrStrong(strong, sourceElement);
 }
 
 /**
  * called when clicking on a morph
  * @param morph the moprh that is clicked on
  */
-function showMorph(morph) {
+function showMorph(morph, sourceElement) {
+	showMorphOrStrong(morph, sourceElement);
+}
+
+/** TODO: move this out of here to utils.js if we have more utility classes/functions 
+ * helper function for morph and strongs 
+*/
+function showMorphOrStrong(tag, sourceElement) {
+	//trigger the parent event - to show everything
+	$(sourceElement).parent().click()
 	
+	//need to find what event is coming in, to get the clicked element and pass that down
+	$("#lexiconDefinition span:contains(" + tag + ")").parent().click();	
 }