For iPad - Adjust

wanghengheng · wanghengheng · commit 7ee79f6ef11b · 2015-03-13T18:03:44.000+08:00
diff --git a/Coding_iOS/Controllers/ConversationViewController.m b/Coding_iOS/Controllers/ConversationViewController.m
@@ -209,7 +209,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
             }
         }];
-        [actionSheet showInView:nil];
+        [actionSheet showInView:self.view];
     };
     cell.refreshMessageMediaCCellBlock = ^(CGFloat diff){
 //        ESStrongSelf;
@@ -259,7 +259,7 @@ - (void)showAlertToDeleteMessage:(PrivateMessage *)toDeleteMsg{
             [_self deletePrivateMessageWithMsg:_messageToResendOrDelete];
         }
     }];
-    [actionSheet showInView:nil];
+    [actionSheet showInView:self.view];
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
diff --git a/Coding_iOS/Controllers/EditTaskViewController.m b/Coding_iOS/Controllers/EditTaskViewController.m
@@ -328,7 +328,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     [weakSelf deleteTask:toDelete];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
         };
         cell.descriptionBtnClickedBlock = ^(Task *task){
             if (weakSelf.myCopyTask.has_description.boolValue && !weakSelf.myCopyTask.task_description) {
@@ -511,7 +511,7 @@ - (void)doCommentToComment:(TaskComment *)toComment sender:(id)sender{
                     [weakSelf deleteComment:weakSelf.toComment];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
             return;
         }
     }
diff --git a/Coding_iOS/Controllers/FileListViewController.m b/Coding_iOS/Controllers/FileListViewController.m
@@ -432,7 +432,7 @@ - (void)swipeableTableViewCell:(SWTableViewCell *)cell didTriggerRightUtilityBut
                     [weakSelf deleteFolder:folder];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
         }
     }else{
         ProjectFile *file = [_myFiles.list objectAtIndex:(indexPath.row - _curFolder.sub_folders.count - _uploadFiles.count)];
@@ -517,7 +517,7 @@ - (void)deleteFile:(ProjectFile *)file{
             }
         }];
     }
-    [actionSheet showInView:nil];
+    [actionSheet showInView:self.view];
 }
 - (void)deleteFile:(ProjectFile *)file fromDisk:(BOOL)fromDisk{
 
diff --git a/Coding_iOS/Controllers/FileViewController.m b/Coding_iOS/Controllers/FileViewController.m
@@ -215,7 +215,7 @@ - (void)rightNavBtnClicked{
                     break;
             }
         }];
-        [actionSheet showInView:nil];
+        [actionSheet showInView:self.view];
     }else{
         [self.docInteractionController presentOpenInMenuFromBarButtonItem:self.navigationItem.rightBarButtonItem animated:YES];
     }
diff --git a/Coding_iOS/Controllers/MeSetting/SettingMineInfoViewController.m b/Coding_iOS/Controllers/MeSetting/SettingMineInfoViewController.m
@@ -189,7 +189,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             switch (indexPath.row) {
                 case 0:{//&#22836;&#20687;
                     UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"&#26356;&#25442;&#22836;&#20687;" delegate:self cancelButtonTitle:@"&#21462;&#28040;" destructiveButtonTitle:nil otherButtonTitles:@"&#25293;&#29031;", @"&#20174;&#30456;&#20876;&#36873;&#25321;", nil];
-                    [actionSheet showInView:nil];
+                    [actionSheet showInView:self.view];
                 }
                     break;
                 case 1:{//&#26165;&#31216;
diff --git a/Coding_iOS/Controllers/MeSetting/SettingViewController.m b/Coding_iOS/Controllers/MeSetting/SettingViewController.m
@@ -155,7 +155,7 @@ - (UIView*)tableFooterView{
 
 - (void)loginOutBtnClicked:(id)sender{
     UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"&#30830;&#23450;&#35201;&#36864;&#20986;&#24403;&#21069;&#36134;&#21495;" delegate:self cancelButtonTitle:@"&#21462;&#28040;" destructiveButtonTitle:@"&#30830;&#23450;&#36864;&#20986;" otherButtonTitles: nil];
-    [actionSheet showInView:nil];
+    [actionSheet showInView:self.view];
 }
 
 #pragma mark UIActionSheetDelegate M
diff --git a/Coding_iOS/Controllers/ProjectMemberListViewController.m b/Coding_iOS/Controllers/ProjectMemberListViewController.m
@@ -217,7 +217,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     [weakSelf quitSelf_ProjectMember:curMember];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
         }else{
 //                &#21035;&#20154;&#65292;&#21457;&#36215;&#31169;&#20449;
             if (_type == ProMemTypeProject) {
@@ -301,7 +301,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
             [weakSelf removeMember:curMember inTableView:tableView];
         }
     }];
-    [actionSheet showInView:nil];
+    [actionSheet showInView:self.view];
 }
 
 - (void)removeMember:(ProjectMember *)curMember inTableView:(UITableView *)tableView{
diff --git a/Coding_iOS/Controllers/RootControllers/Message_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Message_RootViewController.m
@@ -258,7 +258,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
             [weakSelf removeConversation:msg inTableView:tableView];
         }
     }];
-    [actionSheet showInView:nil];
+    [actionSheet showInView:self.view];
 }
 
 - (void)removeConversation:(PrivateMessage *)curMsg inTableView:(UITableView *)tableView{
diff --git a/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m
@@ -326,7 +326,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                         [_self deleteComment:comment ofTweet:_self.commentTweet];
                     }
                 }];
-                [actionSheet showInView:nil];
+                [actionSheet showInView:self.view];
                 return;
             }
         }else{
@@ -362,7 +362,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 [_self deleteTweet:_self.deleteTweet outTweetsIndex:_self.deleteTweetsIndex];
             }
         }];
-        [actionSheet showInView:nil];
+        [actionSheet showInView:self.view];
     };
     cell.goToDetailTweetBlock = ^(Tweet *curTweet){
         [self goToDetailWithTweet:curTweet];
diff --git a/Coding_iOS/Controllers/TopicDetailViewController.m b/Coding_iOS/Controllers/TopicDetailViewController.m
@@ -249,7 +249,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     [weakSelf deleteTopic:weakSelf.curTopic isComment:NO];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
         };
         [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:0];
         return cell;
@@ -299,7 +299,7 @@ - (void)doCommentToTopic:(ProjectTopic *)toComment sender:(id)sender{
                     [_self deleteTopic:_self.toComment isComment:YES];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
             return;
         }
     }
diff --git a/Coding_iOS/Controllers/TweetDetailViewController.m b/Coding_iOS/Controllers/TweetDetailViewController.m
@@ -128,7 +128,7 @@ - (void)rightNavBtnClicked{
                 @strongify(self);
                 [self goToReport];
             }
-        }] showInView:nil];
+        }] showInView:self.view];
     }
 }
 
@@ -230,7 +230,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                     [_self deleteTweet:_self.curTweet];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
         };
         
         cell.userBtnClickedBlock = ^(User *curUser){
@@ -329,7 +329,7 @@ - (void)doCommentToComment:(Comment *)toComment sender:(id)sender{
                     [_self deleteComment:_self.toComment ofTweet:_self.curTweet];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
             return;
         }
     }
diff --git a/Coding_iOS/Controllers/TweetSendViewController.m b/Coding_iOS/Controllers/TweetSendViewController.m
@@ -110,7 +110,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell.addPicturesBlock = ^(){
             [self.view endEditing:YES];
             UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:nil delegate:self cancelButtonTitle:@"&#21462;&#28040;" destructiveButtonTitle:nil otherButtonTitles:@"&#25293;&#29031;", @"&#20174;&#30456;&#20876;&#36873;&#25321;", nil];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self.view];
         };
         return cell;
     }
@@ -206,7 +206,7 @@ - (void)cancelBtnClicked:(id)sender{
                 return ;
             }
             [weakSelf dismissSelf];
-        }] showInView:nil];
+        }] showInView:self.view];
     }
 }
 
diff --git a/Coding_iOS/Controllers/UserTweetsViewController.m b/Coding_iOS/Controllers/UserTweetsViewController.m
@@ -229,7 +229,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                         [weakSelf deleteComment:comment ofTweet:weakSelf.commentTweet];
                     }
                 }];
-                [actionSheet showInView:nil];
+                [actionSheet showInView:self.view];
                 return;
             }
         }else{
@@ -261,7 +261,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 [weakSelf deleteTweet:weakSelf.deleteTweet outTweetsIndex:weakSelf.deleteTweetsIndex];
             }
         }];
-        [actionSheet showInView:nil];
+        [actionSheet showInView:self.view];
     };
 
     cell.goToDetailTweetBlock = ^(Tweet *curTweet){
diff --git a/Coding_iOS/Views/EaseMarkdownTextView.m b/Coding_iOS/Views/EaseMarkdownTextView.m
@@ -220,9 +220,10 @@ - (void)atSomeUser:(User *)curUser andRange:(NSRange)range{
 
 #pragma mark Photo
 - (void)doPhoto{
+    //
     [[UIActionSheet bk_actionSheetCustomWithTitle:nil buttonTitles:@[@"&#25293;&#29031;", @"&#20174;&#30456;&#20876;&#36873;&#25321;"] destructiveTitle:nil cancelTitle:@"&#21462;&#28040;" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) {
         [self presentPhotoVCWithIndex:index];
-    }] showInView:nil];
+    }] showInView:self];
 }
 
 - (void)presentPhotoVCWithIndex:(NSInteger)index{
diff --git a/Coding_iOS/Views/ProjectFolderListView.m b/Coding_iOS/Views/ProjectFolderListView.m
@@ -148,7 +148,7 @@ - (void)swipeableTableViewCell:(SWTableViewCell *)cell didTriggerRightUtilityBut
                     [weakSelf deleteFolder:folder];
                 }
             }];
-            [actionSheet showInView:nil];
+            [actionSheet showInView:self];
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`209`	`209`
`210`	`210`	`}`
`211`	`211`	`}];`
`212`		`- [actionSheet showInView:nil];`
	`212`	`+ [actionSheet showInView:self.view];`
`213`	`213`	`};`
`214`	`214`	`cell.refreshMessageMediaCCellBlock = ^(CGFloat diff){`
`215`	`215`	`// ESStrongSelf;`
`@@ -259,7 +259,7 @@ - (void)showAlertToDeleteMessage:(PrivateMessage *)toDeleteMsg{`
`259`	`259`	`[_self deletePrivateMessageWithMsg:_messageToResendOrDelete];`
`260`	`260`	`}`
`261`	`261`	`}];`
`262`		`- [actionSheet showInView:nil];`
	`262`	`+ [actionSheet showInView:self.view];`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`- (CGFloat)tableView:(UITableView )tableView heightForRowAtIndexPath:(NSIndexPath )indexPath{`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`328`	`328`	`[weakSelf deleteTask:toDelete];`
`329`	`329`	`}`
`330`	`330`	`}];`
`331`		`- [actionSheet showInView:nil];`
	`331`	`+ [actionSheet showInView:self.view];`
`332`	`332`	`};`
`333`	`333`	`cell.descriptionBtnClickedBlock = ^(Task *task){`
`334`	`334`	`if (weakSelf.myCopyTask.has_description.boolValue && !weakSelf.myCopyTask.task_description) {`
`@@ -511,7 +511,7 @@ - (void)doCommentToComment:(TaskComment *)toComment sender:(id)sender{`
`511`	`511`	`[weakSelf deleteComment:weakSelf.toComment];`
`512`	`512`	`}`
`513`	`513`	`}];`
`514`		`- [actionSheet showInView:nil];`
	`514`	`+ [actionSheet showInView:self.view];`
`515`	`515`	`return;`
`516`	`516`	`}`
`517`	`517`	`}`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ - (void)swipeableTableViewCell:(SWTableViewCell *)cell didTriggerRightUtilityBut`
`432`	`432`	`[weakSelf deleteFolder:folder];`
`433`	`433`	`}`
`434`	`434`	`}];`
`435`		`- [actionSheet showInView:nil];`
	`435`	`+ [actionSheet showInView:self.view];`
`436`	`436`	`}`
`437`	`437`	`}else{`
`438`	`438`	`ProjectFile *file = [_myFiles.list objectAtIndex:(indexPath.row - _curFolder.sub_folders.count - _uploadFiles.count)];`
`@@ -517,7 +517,7 @@ - (void)deleteFile:(ProjectFile *)file{`
`517`	`517`	`}`
`518`	`518`	`}];`
`519`	`519`	`}`
`520`		`- [actionSheet showInView:nil];`
	`520`	`+ [actionSheet showInView:self.view];`
`521`	`521`	`}`
`522`	`522`	`- (void)deleteFile:(ProjectFile *)file fromDisk:(BOOL)fromDisk{`
`523`	`523`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ - (void)rightNavBtnClicked{`
`215`	`215`	`break;`
`216`	`216`	`}`
`217`	`217`	`}];`
`218`		`- [actionSheet showInView:nil];`
	`218`	`+ [actionSheet showInView:self.view];`
`219`	`219`	`}else{`
`220`	`220`	`[self.docInteractionController presentOpenInMenuFromBarButtonItem:self.navigationItem.rightBarButtonItem animated:YES];`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath`
`189`	`189`	`switch (indexPath.row) {`
`190`	`190`	`case 0:{//头像`
`191`	`191`	`UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"更换头像" delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:nil otherButtonTitles:@"拍照", @"从相册选择", nil];`
`192`		`- [actionSheet showInView:nil];`
	`192`	`+ [actionSheet showInView:self.view];`
`193`	`193`	`}`
`194`	`194`	`break;`
`195`	`195`	`case 1:{//昵称`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ - (UIView*)tableFooterView{`
`155`	`155`
`156`	`156`	`- (void)loginOutBtnClicked:(id)sender{`
`157`	`157`	`UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"确定要退出当前账号" delegate:self cancelButtonTitle:@"取消" destructiveButtonTitle:@"确定退出" otherButtonTitles: nil];`
`158`		`- [actionSheet showInView:nil];`
	`158`	`+ [actionSheet showInView:self.view];`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`#pragma mark UIActionSheetDelegate M`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`217`	`217`	`[weakSelf quitSelf_ProjectMember:curMember];`
`218`	`218`	`}`
`219`	`219`	`}];`
`220`		`- [actionSheet showInView:nil];`
	`220`	`+ [actionSheet showInView:self.view];`
`221`	`221`	`}else{`
`222`	`222`	`// 别人，发起私信`
`223`	`223`	`if (_type == ProMemTypeProject) {`
`@@ -301,7 +301,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd`
`301`	`301`	`[weakSelf removeMember:curMember inTableView:tableView];`
`302`	`302`	`}`
`303`	`303`	`}];`
`304`		`- [actionSheet showInView:nil];`
	`304`	`+ [actionSheet showInView:self.view];`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`- (void)removeMember:(ProjectMember )curMember inTableView:(UITableView )tableView{`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd`
`258`	`258`	`[weakSelf removeConversation:msg inTableView:tableView];`
`259`	`259`	`}`
`260`	`260`	`}];`
`261`		`- [actionSheet showInView:nil];`
	`261`	`+ [actionSheet showInView:self.view];`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`- (void)removeConversation:(PrivateMessage )curMsg inTableView:(UITableView )tableView{`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`326`	`326`	`[_self deleteComment:comment ofTweet:_self.commentTweet];`
`327`	`327`	`}`
`328`	`328`	`}];`
`329`		`- [actionSheet showInView:nil];`
	`329`	`+ [actionSheet showInView:self.view];`
`330`	`330`	`return;`
`331`	`331`	`}`
`332`	`332`	`}else{`
`@@ -362,7 +362,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`362`	`362`	`[_self deleteTweet:_self.deleteTweet outTweetsIndex:_self.deleteTweetsIndex];`
`363`	`363`	`}`
`364`	`364`	`}];`
`365`		`- [actionSheet showInView:nil];`
	`365`	`+ [actionSheet showInView:self.view];`
`366`	`366`	`};`
`367`	`367`	`cell.goToDetailTweetBlock = ^(Tweet *curTweet){`
`368`	`368`	`[self goToDetailWithTweet:curTweet];`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`249`	`249`	`[weakSelf deleteTopic:weakSelf.curTopic isComment:NO];`
`250`	`250`	`}`
`251`	`251`	`}];`
`252`		`- [actionSheet showInView:nil];`
	`252`	`+ [actionSheet showInView:self.view];`
`253`	`253`	`};`
`254`	`254`	`[tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:0];`
`255`	`255`	`return cell;`
`@@ -299,7 +299,7 @@ - (void)doCommentToTopic:(ProjectTopic *)toComment sender:(id)sender{`
`299`	`299`	`[_self deleteTopic:_self.toComment isComment:YES];`
`300`	`300`	`}`
`301`	`301`	`}];`
`302`		`- [actionSheet showInView:nil];`
	`302`	`+ [actionSheet showInView:self.view];`
`303`	`303`	`return;`
`304`	`304`	`}`
`305`	`305`	`}`