]> SALOME platform Git repositories - tools/siman.git/commitdiff
Salome HOME
projects / tools / siman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ade241)
Our $() javascript function is removed to be able to use jQuery.
authorrkv <rkv@opencascade.com>
Fri, 7 Dec 2012 08:22:30 +0000 (08:22 +0000)
committerrkv <rkv@opencascade.com>
Fri, 7 Dec 2012 08:22:30 +0000 (08:22 +0000)
Workspace/Siman/WebContent/js/popup.js patch | blob | history
Workspace/Siman/WebContent/rtef/richtext.js patch | blob | history
Workspace/Siman/WebContent/study/displayStudy.jsp patch | blob | history
Workspace/Siman/WebContent/study/displayStudyStep.jsp patch | blob | history

diff --git a/Workspace/Siman/WebContent/js/popup.js b/Workspace/Siman/WebContent/js/popup.js
index b36fda340939624d9ff1a2439cb20b9d10743c32..7c3767de8f8c65a230f67dcfd473cfeee449a5a6 100644 (file)
--- 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 1acd7a9fab570613095b7e22995a407b21b53adf..3dada53abc36cea1123b0866b021f3c833006638 100644 (file)
--- 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 b9b66fcdc9733326eab269cf63309198c1cd6e5c..753263b1318d0f5ab3306fb04f6c3cda2fdcfc08 100644 (file)
--- a/Workspace/Siman/WebContent/study/displayStudy.jsp
+++ b/Workspace/Siman/WebContent/study/displayStudy.jsp
@@ -19,13 +19,13 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-    <link href="../rtef/rte.css" rel="stylesheet" type="text/css">
-    <script language="JavaScript" type="text/javascript" src="../rtef/lang/fr.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../rtef/richtext.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../rtef/xhtml.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../js/popup.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../js/action.js"></script>
+    <link href="<s:url value="/skin/default.css"/>" rel="stylesheet" type="text/css">
+    <link href="<s:url value="/rtef/rte.css"/>" rel="stylesheet" type="text/css">
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/lang/fr.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/richtext.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/xhtml.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/popup.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/action.js"/>"></script>
 
     <script language="JavaScript">
     
diff --git a/Workspace/Siman/WebContent/study/displayStudyStep.jsp b/Workspace/Siman/WebContent/study/displayStudyStep.jsp
index 7712988b67b6727fe490a5c5d96e982d533cf2dd..37d5b7943cb915a3c7755fcce3bad5d0413c96a3 100644 (file)
--- a/Workspace/Siman/WebContent/study/displayStudyStep.jsp
+++ b/Workspace/Siman/WebContent/study/displayStudyStep.jsp
@@ -18,11 +18,11 @@
 
        <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
 
-    <script language="JavaScript" type="text/javascript" src="../rtef/lang/fr.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../rtef/richtext.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../rtef/xhtml.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../js/popup.js"></script>
-    <script language="JavaScript" type="text/javascript" src="../js/action.js"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/lang/fr.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/richtext.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/rtef/xhtml.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/popup.js"/>"></script>
+    <script language="JavaScript" type="text/javascript" src="<s:url value="/js/action.js"/>"></script>
 
     <script language="JavaScript">
     
SALOME simulation manager [DEPRECATED]

Copyright © 2005 - 2024 Open CASCADE.
All rights reserved.
Legal Information