From fce2b8b9ffd7e140bdab2f4e7681ffe189c47c10 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Sun, 20 Jan 2013 09:59:31 +0000
Subject: [PATCH]  * adjust the popup way of colorbox.

---
 module/build/js/common.js            | 2 +-
 module/extension/js/common.js        | 6 +++---
 module/release/js/common.js          | 4 ++--
 module/task/js/create.js             | 2 +-
 module/testcase/js/create.js         | 2 +-
 module/testcase/view/create.html.php | 3 ++-
 module/webapp/js/common.js           | 6 +++---
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/module/build/js/common.js b/module/build/js/common.js
index 5cafeccc97..6be4439ece 100644
--- a/module/build/js/common.js
+++ b/module/build/js/common.js
@@ -1,4 +1,4 @@
 $(document).ready(function()
 {
-    $("a.preview").colorbox({width:1000, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
+    $("a.preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true});
 })
diff --git a/module/extension/js/common.js b/module/extension/js/common.js
index ce34126492..ee82aa7a88 100644
--- a/module/extension/js/common.js
+++ b/module/extension/js/common.js
@@ -1,3 +1,3 @@
-if($('a.iframe').size()) $("a.iframe").colorbox({width:800, height:400, iframe:true, transition:'elastic', speed:350, scrolling:true});
-if($('a.manual').size()) $("a.manual").colorbox({width:1024, height:600, iframe:true, transition:'elastic', speed:350, scrolling:false});
-if($('a.extension').size()) $("a.extension").colorbox({width:1024, height:480, iframe:true, transition:'elastic', speed:350, scrolling:true});
+if($('a.iframe').size()) $("a.iframe").colorbox({width:800, height:400, iframe:true, transition:'none', scrolling:true});
+if($('a.manual').size()) $("a.manual").colorbox({width:1024, height:600, iframe:true, transition:'none', scrolling:false});
+if($('a.extension').size()) $("a.extension").colorbox({width:1024, height:480, iframe:true, transition:'none', scrolling:true});
diff --git a/module/release/js/common.js b/module/release/js/common.js
index 0c5230f1b5..57e6407d9c 100644
--- a/module/release/js/common.js
+++ b/module/release/js/common.js
@@ -3,11 +3,11 @@ function loadStoriesAndBugs(buildID,productID)
     link = createLink('release', 'ajaxGetStoriesAndBugs', 'buildID=' + buildID + '&productID=' + productID);
     $('#linkStoriesAndBugs').load(link, function()
     {
-        $("a.preview").colorbox({width:1000, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
+        $("a.preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true});
     })
 }
 
 $(document).ready(function()
 {
-    $("a.preview").colorbox({width:1000, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
+    $("a.preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true});
 })
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 7ebc62bf15..ad17598c37 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -39,7 +39,7 @@ function setPreview()
         $('#preview').attr('href', storyLink);
     }
 
-    $("#preview").colorbox({width:960, height:500, iframe:true, transition:'elastic', speed:350, scrolling:true});
+    $("#preview").colorbox({width:960, height:500, iframe:true, transition:'none', scrolling:true});
 
     setAfter();
 }
diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js
index 7a628a1f0a..59d47f60af 100644
--- a/module/testcase/js/create.js
+++ b/module/testcase/js/create.js
@@ -15,5 +15,5 @@ function setPreview()
 $(function()
 {
      $("#story").chosen({no_results_text: noResultsMatch});
-     $("#preview").colorbox({width:1000, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
+     $("#preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true});
 })
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 2634292be6..f71e2bb607 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -37,12 +37,13 @@
     <tr>
       <th class='rowhead'><?php echo $lang->testcase->lblStory;?></th>
       <td>
-        <div id='storyIdBox'><?php echo html::select('story', $stories, $storyID, 'class="text-1" onchange=setPreview();');?></div>
+        <div id='storyIdBox'><?php echo html::select('story', $stories, $storyID, 'class="text-1" onchange=setPreview();');?>
         <?php if($storyID == 0): ?>
           <a href='' id='preview' class='iframe hidden'><?php echo $lang->preview;?></a>
         <?php else:?>
           <?php echo html::a($this->createLink('story', 'view', "storyID=$storyID"), $lang->preview, '', "class='iframe' id='preview'");?>
         <?php endif;?>
+        </div>
       </td>
     </tr>  
     <tr>
diff --git a/module/webapp/js/common.js b/module/webapp/js/common.js
index e2433ad382..fd9baf07a6 100644
--- a/module/webapp/js/common.js
+++ b/module/webapp/js/common.js
@@ -1,6 +1,6 @@
-if($('a.iframe').size()) $("a.iframe").colorbox({width:450, height:220, iframe:true, transition:'elastic', speed:350, scrolling:true});
-if($('a.webapp').size()) $("a.webapp").colorbox({width:600, height:400, iframe:true, transition:'elastic', speed:350, scrolling:true});
-if($('a.popup').size()) $("a.popup").colorbox({width:900, height:600, iframe:true, transition:'elastic', speed:350, scrolling:true});
+if($('a.iframe').size()) $("a.iframe").colorbox({width:450, height:220, iframe:true, transition:'none', scrolling:true});
+if($('a.webapp').size()) $("a.webapp").colorbox({width:600, height:400, iframe:true, transition:'none', scrolling:true});
+if($('a.popup').size()) $("a.popup").colorbox({width:900, height:600, iframe:true, transition:'none', scrolling:true});
 
 function popup(width, height)
 {