From 128954859b00e1787f00cf455b983077f1420a7d Mon Sep 17 00:00:00 2001 From: rkv Date: Fri, 7 Dec 2012 08:22:30 +0000 Subject: [PATCH] Our $() javascript function is removed to be able to use jQuery. --- Workspace/Siman/WebContent/js/popup.js | 12 ++++++------ Workspace/Siman/WebContent/rtef/richtext.js | 5 +++-- Workspace/Siman/WebContent/study/displayStudy.jsp | 14 +++++++------- .../Siman/WebContent/study/displayStudyStep.jsp | 10 +++++----- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Workspace/Siman/WebContent/js/popup.js b/Workspace/Siman/WebContent/js/popup.js index b36fda3..7c3767d 100644 --- a/Workspace/Siman/WebContent/js/popup.js +++ b/Workspace/Siman/WebContent/js/popup.js @@ -81,7 +81,7 @@ var target = event.target != null ? event.target : event.srcElement; target = target.parentNode; // Gets the hyperlink if (_replaceContext) { - _divContext = $(target.attributes[0].nodeValue); // Popup involved (made of document index prefixed by "popup") + _divContext = document.getElementById(target.attributes[0].nodeValue); // Popup involved (made of document index prefixed by "popup") // document.body.scrollTop does not work in IE var scrollTop = document.scrollTop ? document.scrollTop : document.documentElement.scrollTop; @@ -101,8 +101,8 @@ return true; } -// For making easier on the eyes and fingers - function $(id) { -// -------------- - return document.getElementById(id); - } \ No newline at end of file +//// For making easier on the eyes and fingers +// function $(id) { +//// -------------- +// return document.getElementById(id); +// } \ No newline at end of file diff --git a/Workspace/Siman/WebContent/rtef/richtext.js b/Workspace/Siman/WebContent/rtef/richtext.js index 1acd7a9..3dada53 100644 --- a/Workspace/Siman/WebContent/rtef/richtext.js +++ b/Workspace/Siman/WebContent/rtef/richtext.js @@ -34,6 +34,7 @@ //////////////////////////////////////////////////////////////////////////////// // Constants +var ctxpath = "/siman/"; var minWidth = 450; // minumum width var wrapWidth = 1245; //width at which all icons will appear on one bar var maxchar = 64000; // maximum number of characters per save @@ -135,7 +136,7 @@ function initTextInput() { wrapWidth = 14 * 24; defaultFont = "Arial, Helvetica, sans-serif"; - initRTE("../rtef/images/", "../rtef/", "", true); + initRTE(ctxpath + "rtef/images/", ctxpath + "rtef/", "", true); } function initTextEditor() { @@ -158,7 +159,7 @@ function initTextEditor() { wrapWidth = 15 * 24; defaultFont = "Arial, Helvetica, sans-serif"; - initRTE("../rtef/images/", "../rtef/", "", true); + initRTE(ctxpath + "rtef/images/", ctxpath + "rtef/", "", true); } function addCommand(name, action) { diff --git a/Workspace/Siman/WebContent/study/displayStudy.jsp b/Workspace/Siman/WebContent/study/displayStudy.jsp index b9b66fc..753263b 100644 --- a/Workspace/Siman/WebContent/study/displayStudy.jsp +++ b/Workspace/Siman/WebContent/study/displayStudy.jsp @@ -19,13 +19,13 @@ <s:text name="name.module"/> - rel="stylesheet" type="text/css"> - - - - - - + " rel="stylesheet" type="text/css"> + " rel="stylesheet" type="text/css"> + + + + + - - - - + + + + +