Merge pull request #455 from RocketChat/bug/links_textview.454

Fixed: touch on Links/Phones/Dates in the message text
RocketChat · May 5, 2017 · 2a744f0 · 2a744f0
2 parents 07e93ae + 4184c2a
commit 2a744f0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/Rocket.Chat/Controllers/Chat/ChatViewController.swift b/Rocket.Chat/Controllers/Chat/ChatViewController.swift
@@ -116,14 +116,6 @@ final class ChatViewController: SLKTextViewController {
         }
     }
 
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-
-        view?.layoutSubviews()
-        collectionView?.layoutSubviews()
-        scrollToBottom()
-    }
-
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
 

diff --git a/Rocket.Chat/Info.plist b/Rocket.Chat/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>59</string>
+	<string>60</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Rocket.Chat/Views/Cells/Chat/ChatMessageCell.xib b/Rocket.Chat/Views/Cells/Chat/ChatMessageCell.xib
@@ -45,7 +45,7 @@
                             <constraint firstAttribute="width" constant="35" id="Cny-FU-tGi"/>
                         </constraints>
                     </view>
-                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Text" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jz0-wl-Wig">
+                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Text" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="jz0-wl-Wig">
                         <rect key="frame" x="42" y="23" width="300" height="44"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>