Changeset 6504

Timestamp:

Aug 6, 2014, 9:30:22 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1826: Do not warn when re-opening read-only dialog windows

Found two more places:

• View raw data
• View array design feature

Dialogs that want to use this feature should set the read-only attribute in the <base:body> tag:

<base:body data-read-only="1">

Location:

branches/3.3-stable/www

Files:

• common/help/view_help.jsp (modified) (1 diff)
• include/scripts/main-2.js (modified) (1 diff)
• include/scripts/popup.js (modified) (1 diff)
• info/about.jsp (modified) (1 diff)
• info/broadcast.jsp (modified) (1 diff)
• info/forgot_password.jsp (modified) (1 diff)
• info/get_account.jsp (modified) (1 diff)
• lims/arraydesigns/features/view_feature.jsp (modified) (1 diff)
• logout.jsp (modified) (1 diff)
• my_base/messages/view_message.jsp (modified) (1 diff)
• views/jobs/view_job.jsp (modified) (1 diff)
• views/rawbioassays/rawdata/view_rawdata.jsp (modified) (1 diff)
• views/sessions/view_session.jsp (modified) (1 diff)

branches/3.3-stable/www/common/help/view_help.jsp

@@ -118 +118 @@
   <base:page type="popup" title="Help">
   <base:head styles="help.css" scripts="~help.js" />
-  <base:body>
+  <base:body data-read-only="1">
     <h1><%=title%></h1>
     

branches/3.3-stable/www/include/scripts/main-2.js

@@ -1234 +1234 @@
     try
     {
-      if (oldWin && !oldWin.closed && oldWin.App)
+      if (oldWin && !oldWin.closed && oldWin.Popup && !oldWin.Popup.isReadOnly())
       {
         var msg = 'This window has already been opened. ';

branches/3.3-stable/www/include/scripts/popup.js

@@ -27 +27 @@
   var internal = {};
   
+  // If the popup dialog is read-only BASE will not
+  // display a warning when trying to re-open the same dialog
+  popup.isReadOnly = function()
+  {
+    return Data.int(document.body, 'read-only');
+  }
+  
   internal.savePosition = function()
   {

branches/3.3-stable/www/info/about.jsp

@@ -67 +67 @@
 <base:page type="popup" title="About">
 <base:head scripts="tabcontrol-2.js,~info.js" styles="tabcontrol.css" />
-<base:body>
+<base:body data-read-only="1">
   <h1>BASE - BioArray Software Environment</h1>
   

branches/3.3-stable/www/info/broadcast.jsp

@@ -41 +41 @@
 <base:page type="popup" title="<%=title%>">
 <base:head scripts="~info.js "/>
-<base:body>
+<base:body data-read-only="1">
   <h1><%=HTML.encodeTags(title)%></h1>
   

branches/3.3-stable/www/info/forgot_password.jsp

@@ -44 +44 @@
 <base:page type="popup" title="Forgot your password?">
 <base:head scripts="~info.js"/>
-<base:body>
+<base:body data-read-only="1">
   <h1>Forgot your password?</h1>
   

branches/3.3-stable/www/info/get_account.jsp

@@ -44 +44 @@
 <base:page type="popup" title="Get an account">
 <base:head scripts="~info.js" />
-<base:body>
+<base:body data-read-only="1">
   <h1>Get an account</h1>
   

branches/3.3-stable/www/lims/arraydesigns/features/view_feature.jsp

@@ -102 +102 @@
   <base:head scripts="tabcontrol-2.js,~features.js" styles="tabcontrol.css">
   </base:head>
-  <base:body>
+  <base:body data-read-only="1">
     <h1><%=title%> <base:help helpid="feature.view.properties" /></h1>
 

branches/3.3-stable/www/logout.jsp

@@ -68 +68 @@
 <base:page type="popup" title="<%=title%>">
 <base:head scripts="~logout.js" />
-<base:body>
+<base:body data-read-only="1">
   <h1><%=title%></h1>
   <div class="content">

branches/3.3-stable/www/my_base/messages/view_message.jsp

@@ -110 +110 @@
   <base:page type="popup" title="<%=title%>" id="view-page">
   <base:head scripts="~messages.js" />
-  <base:body>   
+  <base:body data-read-only="1">    
     <h1><%=title%> <base:help tabcontrol="main" /></h1>
     <div id="page-data" data-item-id="<%=itemId%>"></div>

branches/3.3-stable/www/views/jobs/view_job.jsp

@@ -192 +192 @@
   <base:head scripts="tabcontrol-2.js,table.js,~jobs.js" 
     styles="tabcontrol.css,progressbar.css,table.css" />
-  <base:body>
+  <base:body data-read-only="1">
     <h1><%=title%> <base:help tabcontrol="main" /></h1>
     <div id="page-data" 

branches/3.3-stable/www/views/rawbioassays/rawdata/view_rawdata.jsp

@@ -93 +93 @@
   <base:page title="<%=title%>" type="popup" id="view-page">
   <base:head scripts="tabcontrol-2.js,~rawdata.js" styles="tabcontrol.css" />
-  <base:body>
+  <base:body data-read-only="1">
     <h1><%=title%></h1>
   

branches/3.3-stable/www/views/sessions/view_session.jsp

@@ -91 +91 @@
   <base:page type="popup" title="<%=title%>" id="view-page">
   <base:head scripts="~sessions.js" />
-  <base:body>
+  <base:body data-read-only="1">
     
     <h1><%=title%> <base:help helpid="session.view" /></h1>