Browse Source

Fix a JS bug under HTTPS
---
修复一个https下js出错的bug

star7th 9 years ago
parent
commit
cb983303dd
2 changed files with 8 additions and 3 deletions
  1. 2 1
      Application/Home/View/Item/show.html
  2. 6 2
      Public/js/item/show.js

+ 2 - 1
Application/Home/View/Item/show.html

@@ -105,6 +105,7 @@
       </div>
 
       <input type="hidden" id="item_id" value="{$item.item_id}">
+      <input type="hidden" id="item_domain" value="{$item.item_domain}">
       <input type="hidden" id="current_page_id" value="{$current_page_id}">
       <input type="hidden" id="base_url" value="__APP__">
 
@@ -160,4 +161,4 @@
 <script src="__PUBLIC__/js/jquery.goup.min.js"></script>
 <script src="__PUBLIC__/js/jquery.hotkeys.js"></script>
 
-<script src="__PUBLIC__/js/item/show.js?v=1.12thirdtt&34377"></script>
+<script src="__PUBLIC__/js/item/show.js?v=1.12thirdtt&3437788"></script>

+ 6 - 2
Public/js/item/show.js

@@ -126,6 +126,7 @@ $(function(){
   function change_page(page_id){
       if(!page_id)return;
       var item_id = $("#item_id").val();
+      var item_domain = $("#item_domain").val();
       var base_url = $("#base_url").val();
       var iframe_url =  base_url+"/home/page/index/page_id/"+page_id;
 
@@ -133,9 +134,12 @@ $(function(){
       //$("#page-content").attr("src" , iframe_url);
       $("#edit-link").attr("href" , base_url+"/home/page/edit/page_id/"+page_id);
       $("#copy-link").attr("href" , base_url+"/home/page/edit/item_id/"+item_id+"/copy_page_id/"+page_id);
-      $("#share-page-link").html("http://"+window.location.host+base_url+"/"+item_id+"&page_id="+page_id);
       $("#delete-link").attr("href" , base_url+"/home/page/delete/page_id/"+page_id);
-      history.replaceState(null, null, "http://"+window.location.host+base_url+"/"+item_id+"&page_id="+page_id);
+      
+      var domain = item_domain ? item_domain : item_id ;
+      var cur_page_url =  window.location.protocol +"//"+window.location.host+base_url+"/"+domain+"&page_id="+page_id;
+      $("#share-page-link").html(cur_page_url);
+      history.replaceState(null, null, cur_page_url);
       
       var html = '<iframe id="page-content" width="100%" scrolling="yes"  height="100%" frameborder="0" style=" overflow:visible; height:100%;" name="main"  seamless ="seamless"src="'+iframe_url+'"></iframe>';
       $(".iframe_content").html(html);