Merge branch 'cjwirth-master'

Author: ppamorim

README.md

@@ -6,7 +6,7 @@ RichEditorView
 
 RichEditorView is a simple, modular, drop-in UIView subclass for Rich Text Editing.
 
-Written in Swift 4.0
+Written in Swift 4
 
 Supports iOS 8+ through Cocoapods or Carthage.
 

RichEditorView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RichEditorView"
-  s.version          = "4.0.0"
+  s.version          = "5.0.0"
   s.summary          = "Rich Text Editor for iOS written in Swift"
   s.homepage         = "https://github.com/cjwirth/RichEditorView"
   s.license          = 'BSD 3-clause'
@@ -9,6 +9,7 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/cjwirth'
 
   s.platform     = :ios, '8.0'
+  s.swift_version = '4.0'
   s.requires_arc = true
 
   s.source_files = 'RichEditorView/Classes/*'

RichEditorView/Assets/editor/rich_editor.js

@@ -113,12 +113,16 @@ RE.getText = function() {
     return RE.editor.innerText;
 };
 
+RE.setBaseTextColor = function(color) {
+    RE.editor.style.color  = color;
+};
+
 RE.setPlaceholderText = function(text) {
     RE.editor.setAttribute("placeholder", text);
 };
 
 RE.updatePlaceholder = function() {
-    if (RE.editor.textContent.length > 0) {
+    if (RE.editor.innerHTML.indexOf('img') !== -1 || (RE.editor.textContent.length > 0 && RE.editor.innerHTML.length > 0)) {
         RE.editor.classList.remove("placeholder");
     } else {
         RE.editor.classList.add("placeholder");

RichEditorView/Classes/RichEditorToolbar.swift

@@ -25,7 +25,7 @@ import UIKit
 }
 
 /// RichBarButtonItem is a subclass of UIBarButtonItem that takes a callback as opposed to the target-action pattern
-open class RichBarButtonItem: UIBarButtonItem {
+@objcMembers open class RichBarButtonItem: UIBarButtonItem {
     open var actionHandler: (() -> Void)?
 
     public convenience init(image: UIImage? = nil, handler: (() -> Void)? = nil) {
@@ -48,7 +48,7 @@ open class RichBarButtonItem: UIBarButtonItem {
 }
 
 /// RichEditorToolbar is UIView that contains the toolbar for actions that can be performed on a RichEditorView
-open class RichEditorToolbar: UIView {
+@objcMembers open class RichEditorToolbar: UIView {
 
     /// The delegate to receive events that cannot be automatically completed
     open weak var delegate: RichEditorToolbarDelegate?
@@ -134,7 +134,7 @@ open class RichEditorToolbar: UIView {
         }
         toolbar.items = buttons
 
-        let defaultIconWidth: CGFloat = 22
+        let defaultIconWidth: CGFloat = 28
         let barButtonItemMargin: CGFloat = 11
         let width: CGFloat = buttons.reduce(0) {sofar, new in
             if let view = new.value(forKey: "view") as? UIView {

RichEditorView/Classes/RichEditorView.swift

@@ -40,7 +40,7 @@ import UIKit
 }
 
 /// RichEditorView is a UIView that displays richly styled text, and allows it to be edited in a WYSIWYG fashion.
-open class RichEditorView: UIView, UIScrollViewDelegate, UIWebViewDelegate, UIGestureRecognizerDelegate {
+@objcMembers open class RichEditorView: UIView, UIScrollViewDelegate, UIWebViewDelegate, UIGestureRecognizerDelegate {
 
     // MARK: Public Properties
 
@@ -278,6 +278,10 @@ open class RichEditorView: UIView, UIScrollViewDelegate, UIWebViewDelegate, UIGe
         runJS("RE.setTextColor('\(color.hex)');")
     }
 
+    public func setEditorFontColor(_ color: UIColor) {
+        runJS("RE.setBaseTextColor('\(color.hex)');")
+    }
+    
     public func setTextBackgroundColor(_ color: UIColor) {
         runJS("RE.prepareInsert();")
         runJS("RE.setTextBackgroundColor('\(color.hex)');")
@@ -528,6 +532,8 @@ open class RichEditorView: UIView, UIScrollViewDelegate, UIWebViewDelegate, UIGe
         }
     }
 
+    // MARK: - Responder Handling
+
     /// Called by the UITapGestureRecognizer when the user taps the view.
     /// If we are not already the first responder, focus the editor.
     @objc private func viewWasTapped() {
@@ -537,5 +543,19 @@ open class RichEditorView: UIView, UIScrollViewDelegate, UIWebViewDelegate, UIGe
             focus(at: point)
         }
     }
-    
+
+    override open func becomeFirstResponder() -> Bool {
+        if !webView.containsFirstResponder {
+            focus()
+            return true
+        } else {
+            return false
+        }
+    }
+
+    open override func resignFirstResponder() -> Bool {
+        blur()
+        return true
+    }
+
 }

RichEditorViewSample/Podfile

@@ -1,4 +1,5 @@
 use_frameworks!
+platform :ios, '8.0'
 
 target 'RichEditorViewSample' do
     pod "RichEditorView", :path => "../"

RichEditorViewSample/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - RichEditorView (3.2.0)
+  - RichEditorView (5.0.0)
 
 DEPENDENCIES:
   - RichEditorView (from `../`)
 
 EXTERNAL SOURCES:
   RichEditorView:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
-  RichEditorView: b4ee60a4f5301cbe8f3fcb1f065cdd7de74ddd10
+  RichEditorView: 2b536e648162702950a152786223f5a55794504f
 
-PODFILE CHECKSUM: db274185d3928152699d5fb4a21714929f874dd8
+PODFILE CHECKSUM: 7a4df9933ce0390c2a1aa64e14fa39cd32734a0d
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.4.0