修复移动端分享版本报错问题

feesland · Dec 17, 2014 · 031dd42 · 031dd42
1 parent 04f4b96
commit 031dd42
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/ui/menu/share/m-share.js b/ui/menu/share/m-share.js
@@ -39,7 +39,6 @@ KityMinder.registerUI('menu/share/m-share', function (minder) {
 
             }).then(function(doc) {
                 var $title = minder.getUI('topbar/title');
-                $title.setTitle('[分享的] ' + $title.getTitle());
             });
         }
 

diff --git a/ui/menu/share/share.js b/ui/menu/share/share.js
@@ -21,7 +21,7 @@ KityMinder.registerUI('menu/share/share', function(minder) {
     var BACKEND_URL = 'http://naotu.baidu.com/share.php';
 
     if (window.location.host == 'local.host') {
-        BACKEND_URL = '/naotu/share.php'; // 测试环境
+        //BACKEND_URL = '/naotu/share.php'; // 测试环境
     }
 
     var currentShare = null;
@@ -42,13 +42,12 @@ KityMinder.registerUI('menu/share/share', function(minder) {
     $doc.on('docload', function(doc) {
         if (doc.source != 'netdisk') {
             currentShare = null;
-            $('#public-share .share-body', $create_menu).hide();
             setShareType('none');
         }
-        var shared = getShareByPath(doc.path);
-        if (shared) {
+        shareListLoaded.then(function() {
+            var shared = getShareByPath(doc.path);
             setCurrentShare(shared);
-        }
+        });
     });
 
     $doc.on('docsave', function(doc) {
@@ -210,7 +209,10 @@ KityMinder.registerUI('menu/share/share', function(minder) {
 
     function setCurrentShare(share) {
         currentShare = share;
-        renderPublicShare(share);
+        if (share)
+            renderPublicShare(share);
+        else
+            setShareType('none');
     }
 
     function renderCreatePanel() {
@@ -331,9 +333,6 @@ KityMinder.registerUI('menu/share/share', function(minder) {
     }
 
     function removeCurrentShareSelect() {
-        var $sbody = $('#public-share .share-body', $create_menu);
-        $sbody.hide();
-
         if (currentShare.$listItem) {
             currentShare.$listItem.remove();
         }
@@ -415,7 +414,12 @@ KityMinder.registerUI('menu/share/share', function(minder) {
     }
 
     function setShareType(value) {
-
+        var $sbody = $('#public-share .share-body', $create_menu);
+        if (value == 'public') {
+            $sbody.show();
+        } else {
+            $sbody.hide();
+        }
         $('#share-select input[name=sharetype][value=' + value + ']', $create_menu)
             .prop('checked', true);
     }
@@ -448,8 +452,6 @@ KityMinder.registerUI('menu/share/share', function(minder) {
             resetShare();
         }
         setShareType('public');
-
-        $sbody.show();
     }
 
     function loadShareList() {
@@ -480,7 +482,7 @@ KityMinder.registerUI('menu/share/share', function(minder) {
         if (!list) return;
         $share_list.empty();
         list.forEach(function(share) {
-            $share_list.append(buildShareItem(share));
+            $share_list.append(share.$listItem = buildShareItem(share));
         });
     }
 

diff --git a/ui/widget/notice.js b/ui/widget/notice.js
@@ -126,8 +126,9 @@ KityMinder.registerUI('widget/notice', function(minder) {
         if (warn) $notice.addClass('warn');
         else $notice.removeClass('warn');
 
+        var $menu = minder.getUI('menu/menu');
         $notice.css({
-            top: minder.getUI('menu/menu').isVisible() ?
+            top: $menu && $menu.isVisible() ?
                 $('#main-menu .main-menu-level1').offset().top :
                 $('#kityminder').offset().top + 20
         });
-Original file line number
+Diff line change
@@ Expand Up @@
                 }).then(function(doc) {
                     var $title = minder.getUI('topbar/title');
-                    $title.setTitle('[分享的] ' + $title.getTitle());
                 });
             }
@@ Expand Down @@