v4.2.1

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode8.2
+osx_image: xcode9
 language: objective-c
 notifications:
   email: true

Assets/WPEditorFormatbarView.xib

@@ -1,18 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="15A282b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="WPEditorFormatbarView">
-            <rect key="frame" x="0.0" y="0.0" width="482" height="42"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="482" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
             <subviews>
                 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hzl-cy-vzk">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                    <animations/>
+                    <rect key="frame" x="0.0" y="0.0" width="482" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="2hQ-8w-6RU"/>
                     </constraints>
@@ -38,16 +42,14 @@
                             <exclude reference="2hQ-8w-6RU"/>
                         </mask>
                     </variation>
-                    <variation key="widthClass=regular" misplaced="YES">
-                        <rect key="frame" x="0.0" y="0.0" width="482" height="44"/>
+                    <variation key="widthClass=regular">
                         <mask key="constraints">
                             <include reference="2hQ-8w-6RU"/>
                         </mask>
                     </variation>
                 </toolbar>
                 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n1r-fs-i80">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                    <animations/>
+                    <rect key="frame" x="0.0" y="0.0" width="482" height="44"/>
                     <items>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="dUc-fD-xmY"/>
                         <barButtonItem title="Img" width="44" style="plain" id="IvH-tE-Dmv" customClass="ZSSBarButtonItem"/>
@@ -68,10 +70,9 @@
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="KpA-gG-9xb"/>
                     </items>
                 </toolbar>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5oj-N8-CBI">
-                    <rect key="frame" x="0.0" y="0.0" width="240" height="128"/>
-                    <animations/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oj-N8-CBI">
+                    <rect key="frame" x="0.0" y="0.0" width="482" height="1"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="DQc-We-xJ8"/>
                     </constraints>
@@ -85,24 +86,22 @@
                             <include reference="DQc-We-xJ8"/>
                         </mask>
                     </variation>
-                    <variation key="widthClass=regular" misplaced="YES">
-                        <rect key="frame" x="0.0" y="-2" width="482" height="1"/>
+                    <variation key="widthClass=regular">
                         <mask key="constraints">
                             <include reference="DQc-We-xJ8"/>
                         </mask>
                     </variation>
                 </view>
             </subviews>
-            <animations/>
-            <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+            <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="hzl-cy-vzk" secondAttribute="trailing" id="3Cf-0J-TmW"/>
                 <constraint firstAttribute="trailing" secondItem="5oj-N8-CBI" secondAttribute="trailing" id="3Qa-Uv-8nO"/>
                 <constraint firstItem="hzl-cy-vzk" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="4b9-4h-eWO"/>
-                <constraint firstItem="hzl-cy-vzk" firstAttribute="top" secondItem="5oj-N8-CBI" secondAttribute="bottom" id="98w-GC-dOE"/>
                 <constraint firstItem="5oj-N8-CBI" firstAttribute="leading" secondItem="hzl-cy-vzk" secondAttribute="leading" id="9Gh-oq-DQO"/>
-                <constraint firstItem="n1r-fs-i80" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="KLa-wT-1Gc"/>
-                <constraint firstItem="n1r-fs-i80" firstAttribute="top" secondItem="5oj-N8-CBI" secondAttribute="top" id="MY8-Yb-Zho"/>
+                <constraint firstItem="5oj-N8-CBI" firstAttribute="top" secondItem="hzl-cy-vzk" secondAttribute="top" id="K0a-ZY-Z3h"/>
+                <constraint firstItem="n1r-fs-i80" firstAttribute="bottom" secondItem="iN0-l3-epB" secondAttribute="bottom" id="KLa-wT-1Gc"/>
+                <constraint firstItem="5oj-N8-CBI" firstAttribute="top" secondItem="n1r-fs-i80" secondAttribute="top" id="MY8-Yb-Zho"/>
                 <constraint firstAttribute="bottom" secondItem="hzl-cy-vzk" secondAttribute="bottom" id="NZc-BN-ZZf"/>
                 <constraint firstItem="n1r-fs-i80" firstAttribute="leading" secondItem="5oj-N8-CBI" secondAttribute="leading" id="Yfe-DH-K5f"/>
                 <constraint firstItem="5oj-N8-CBI" firstAttribute="trailing" secondItem="hzl-cy-vzk" secondAttribute="trailing" id="b1S-cy-zck"/>
@@ -120,18 +119,18 @@
                     <exclude reference="5oj-N8-CBI"/>
                 </mask>
                 <mask key="constraints">
-                    <exclude reference="KLa-wT-1Gc"/>
-                    <exclude reference="MY8-Yb-Zho"/>
-                    <exclude reference="Yfe-DH-K5f"/>
-                    <exclude reference="kVg-01-4Kx"/>
-                    <exclude reference="3Cf-0J-TmW"/>
-                    <exclude reference="4b9-4h-eWO"/>
-                    <exclude reference="98w-GC-dOE"/>
-                    <exclude reference="NZc-BN-ZZf"/>
                     <exclude reference="3Qa-Uv-8nO"/>
                     <exclude reference="9Gh-oq-DQO"/>
+                    <exclude reference="K0a-ZY-Z3h"/>
+                    <exclude reference="MY8-Yb-Zho"/>
                     <exclude reference="b1S-cy-zck"/>
                     <exclude reference="hKN-cF-AOT"/>
+                    <exclude reference="3Cf-0J-TmW"/>
+                    <exclude reference="4b9-4h-eWO"/>
+                    <exclude reference="NZc-BN-ZZf"/>
+                    <exclude reference="KLa-wT-1Gc"/>
+                    <exclude reference="Yfe-DH-K5f"/>
+                    <exclude reference="kVg-01-4Kx"/>
                 </mask>
             </variation>
             <variation key="widthClass=compact">
@@ -140,12 +139,12 @@
                     <include reference="5oj-N8-CBI"/>
                 </mask>
                 <mask key="constraints">
-                    <include reference="KLa-wT-1Gc"/>
+                    <include reference="3Qa-Uv-8nO"/>
                     <include reference="MY8-Yb-Zho"/>
+                    <include reference="hKN-cF-AOT"/>
+                    <include reference="KLa-wT-1Gc"/>
                     <include reference="Yfe-DH-K5f"/>
                     <include reference="kVg-01-4Kx"/>
-                    <include reference="3Qa-Uv-8nO"/>
-                    <include reference="hKN-cF-AOT"/>
                 </mask>
             </variation>
             <variation key="widthClass=regular">
@@ -154,13 +153,12 @@
                     <include reference="5oj-N8-CBI"/>
                 </mask>
                 <mask key="constraints">
+                    <include reference="9Gh-oq-DQO"/>
+                    <include reference="K0a-ZY-Z3h"/>
+                    <include reference="b1S-cy-zck"/>
                     <include reference="3Cf-0J-TmW"/>
                     <include reference="4b9-4h-eWO"/>
-                    <include reference="98w-GC-dOE"/>
                     <include reference="NZc-BN-ZZf"/>
-                    <include reference="9Gh-oq-DQO"/>
-                    <include reference="b1S-cy-zck"/>
-                    <exclude reference="hKN-cF-AOT"/>
                 </mask>
             </variation>
             <connections>
@@ -182,6 +180,7 @@
                 <outlet property="quoteRegularButton" destination="e8U-7y-KIf" id="io2-3W-Xm7"/>
                 <outlet property="regularToolbar" destination="hzl-cy-vzk" id="JmV-O8-V0Q"/>
                 <outlet property="strikeRegularButton" destination="o79-Ie-Knp" id="uxb-KH-prM"/>
+                <outlet property="toolbarBottomConstraint" destination="KLa-wT-1Gc" id="7ib-qR-R8H"/>
                 <outlet property="unorderedListButton" destination="TxB-Wv-LZc" id="DpK-lQ-2Pd"/>
                 <outlet property="unorderedRegularListButton" destination="npM-g4-LTt" id="R4Q-G4-yNS"/>
             </connections>

Classes/HRColorPickerViewController.h

@@ -66,8 +66,10 @@ typedef enum {
  */
 - (id)initWithColor:(UIColor*)defaultColor fullColor:(BOOL)fullColor saveStyle:(HCPCSaveStyle)saveStyle;
 
-/** @deprecated use -save: instead of this . */
-- (void)saveColor:(id)sender;
+/**
+ * @deprecated use -save: instead of this.
+ */
+- (void)saveColor:(id)sender __attribute__((deprecated));
 
 - (void)save;
 - (void)save:(id)sender;

Classes/WPEditorField.h

@@ -18,7 +18,7 @@
  *  @brief      Initializes the field with the specified HTML node id.
  *
  *  @param      nodeId      The id of the html node this object will wrap.  Cannot be nil.
- *  @param      webVieq     The web view to use for all javascript calls.  Cannot be nil.
+ *  @param      webView     The web view to use for all javascript calls.  Cannot be nil.
  *
  *  @returns    The initialized object.
  */
@@ -87,7 +87,7 @@
 /**
  *  @brief      Sets the placeholder color for this field.
  *
- *  @param      placeholderText     The new placeholder color.
+ *  @param      placeholderColor     The new placeholder color.
  */
 - (void)setPlaceholderColor:(UIColor *)placeholderColor;
 

Classes/WPEditorField.m

@@ -169,7 +169,7 @@ - (void)setText:(NSString*)text
     } else {
 
         if (text) {
-            text = [self addSlashes:text];
+            text = [self sanitizeHTML:text];
         } else {
             text = @"";
         }
@@ -187,7 +187,7 @@ - (void)setHtml:(NSString*)html
     } else {
 
         if (html) {
-            html = [self addSlashes:html];
+            html = [self sanitizeHTML:html];
         } else {
             html = @"";
         }
@@ -205,7 +205,7 @@ - (void)setPlaceholderText:(NSString*)placeholderText
     if (!self.domLoaded) {
         self.preloadedPlaceholderText = placeholderText;
     } else {
-        placeholderText = [self addSlashes:placeholderText];
+        placeholderText = [self sanitizeHTML:placeholderText];
         NSString* javascript = [NSString stringWithFormat:@"%@.setPlaceholderText(\"%@\");", [self wrappedNodeJavascriptAccessor], placeholderText];
 
         [self.webView stringByEvaluatingJavaScriptFromString:javascript];
@@ -232,15 +232,18 @@ - (void)setPlaceholderColor:(UIColor *)placeholderColor
 #pragma mark - URL & HTML utilities
 
 /**
- *  @brief      Adds slashes to the specified HTML string, to prevent injections when calling JS
+ *  @brief      Adds slashes and removes script tags from the specified HTML string, to prevent injections when calling JS
  *              code.
  *
- *  @param      html        The HTML string to add slashes to.  Cannot be nil.
+ *  @param      html    The HTML string to sanitize.  Cannot be nil.
  *
- *  @returns    The HTML string with the added slashes.
+ *  @returns    The sanitized HTML string.
  */
-- (NSString *)addSlashes:(NSString *)html
+- (NSString *)sanitizeHTML:(NSString *)html
 {
+    html = [html stringByReplacingOccurrencesOfString:@"—" withString:@"--"];
+    html = [html stringByReplacingOccurrencesOfString:@"“" withString:@"\""];
+    html = [html stringByReplacingOccurrencesOfString:@"”" withString:@"\""];
     html = [html stringByReplacingOccurrencesOfString:@"\\" withString:@"\\\\"];
     html = [html stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
     html = [html stringByReplacingOccurrencesOfString:@"\r"  withString:@"\\r"];
@@ -252,6 +255,9 @@ - (NSString *)addSlashes:(NSString *)html
     html = [html stringByReplacingOccurrencesOfString:@"\u2028"  withString:@"\\u2028"];
     html = [html stringByReplacingOccurrencesOfString:@"\u2029"  withString:@"\\u2029"];
 
+    html = [html stringByReplacingOccurrencesOfString:@"<script>" withString:@"&lt;script&gt;" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [html length])];
+    html = [html stringByReplacingOccurrencesOfString:@"</script>" withString:@"&lt;/script&gt;" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [html length])];
+
     return html;
 }
 

Classes/WPEditorFormatbarView.h

@@ -3,6 +3,8 @@
 @class WPEditorFormatbarView;
 @class ZSSBarButtonItem;
 
+extern const CGFloat WPEditorFormatbarViewToolbarHeight;
+
 typedef enum
 {
     kWPEditorViewControllerElementTagUnknown = -1,
@@ -139,6 +141,14 @@ typedef enum
 
 #pragma mark - Toolbar items
 
+/**
+ *  @brief      Returns a toolbar item (if any) matching the specified tag.
+ *
+ *  @param      tag     WPEditorViewControllerElementTag of the item to return.
+ *  @return     A toolbar item with the specified tag.
+ */
+- (UIBarButtonItem *)toolBarItemWithTag:(WPEditorViewControllerElementTag)tag;
+
 /**
  *  @brief      Makes a toolbar item visible or hidden
  *

Classes/WPEditorFormatbarView.m

@@ -4,11 +4,14 @@
 #import "WPEditorToolbarButton.h"
 #import "ZSSBarButtonItem.h"
 
+const CGFloat WPEditorFormatbarViewToolbarHeight = 44;
+
 @interface WPEditorFormatbarView ()
 
 @property (unsafe_unretained, nonatomic) IBOutlet UIToolbar *leftToolbar;
 @property (unsafe_unretained, nonatomic) IBOutlet UIToolbar *regularToolbar;
 @property (unsafe_unretained, nonatomic) IBOutlet UIView *horizontalBorder;
+@property (unsafe_unretained, nonatomic) IBOutlet NSLayoutConstraint *toolbarBottomConstraint;
 
 // Compact size class bar button items
 @property (unsafe_unretained, nonatomic) IBOutlet ZSSBarButtonItem *imageButton;
@@ -92,6 +95,24 @@ - (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection
     DDLogInfo(@"Format bar trait collection did change from: %@", previousTraitCollection);
 }
 
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    // HACK: Sergio Estevao (2017-10-10): Change the size of the items whe running on a device with a width smaller or equal than 320 (iPhone SE)
+    if (self.frame.size.width <= 320) {
+        for (UIBarButtonItem *item in self.leftToolbar.items) {
+            item.width = roundf(item.image.size.width * 0.75);
+        }
+    }
+}
+
+- (void)layoutMarginsDidChange {
+    [super layoutMarginsDidChange];
+    // Sergio Estevao (2017-10-13): On iOS11 we move the contraint to use the safeAreaInsets in order to be safe on iOS11.
+    if( @available(iOS 11, *)) {
+        self.toolbarBottomConstraint.constant = -self.safeAreaInsets.bottom;
+    }
+}
+
 #pragma mark - Setters
 
 - (void)setBackgroundColor:(UIColor *)backgroundColor
@@ -189,6 +210,27 @@ - (void)setSelectedItemTintColor:(UIColor *)selectedItemTintColor
 
 #pragma mark - Toolbar items
 
+- (UIBarButtonItem *)toolBarItemWithTag:(WPEditorViewControllerElementTag)tag
+{
+    // Find whichever toolbar is currently installed in the view hierarchy.
+    UIToolbar *toolbar;
+    if (self.leftToolbar.window) {
+        toolbar = self.leftToolbar;
+    } else if (self.regularToolbar.window) {
+        toolbar = self.regularToolbar;
+    }
+
+    if (toolbar) {
+        for (ZSSBarButtonItem *item in toolbar.items) {
+            if (item.tag == tag) {
+                return item;
+            }
+        }
+    }
+
+    return nil;
+}
+
 - (void)toolBarItemWithTag:(WPEditorViewControllerElementTag)tag setVisible:(BOOL)visible
 {
     for (ZSSBarButtonItem *item in self.leftToolbar.items) {
@@ -329,10 +371,12 @@ - (void)initBarButtonItem:(ZSSBarButtonItem*)barButtonItem
     customButton.normalTintColor = self.itemTintColor;
     customButton.selectedTintColor = self.selectedItemTintColor;
     customButton.disabledTintColor = self.disabledItemTintColor;
+    customButton.imageView.contentMode = UIViewContentModeScaleAspectFill;
     [customButton addTarget:target
                      action:selector
            forControlEvents:UIControlEventTouchUpInside];
     barButtonItem.customView = customButton;
+    barButtonItem.image = image;
 }
 
 - (void)initBlockQuoteBarButton

Classes/WPEditorView.h

@@ -124,7 +124,7 @@
  * @brief		Received when the user taps on a video in the editor.
  *
  * @param		editorView	The editor view.
- * @param		videoId		The id of image of the image that was tapped.
+ * @param		videoID		The id of image of the image that was tapped.
  * @param		url			The url of the image that was tapped.
  *
  */
@@ -156,7 +156,7 @@ stylesForCurrentSelection:(NSArray*)styles;
  * @brief		Received when a video local url is replaced by the final remote url.
  *
  * @param		editorView	The editor view.
- * @param		videoId		The unique id of the video that had the local url replaced by remote url.
+ * @param		videoID		The unique id of the video that had the local url replaced by remote url.
  *
  */
 - (void)editorView:(WPEditorView*)editorView
@@ -166,7 +166,7 @@ stylesForCurrentSelection:(NSArray*)styles;
  * @brief		Received when an image is pasted into the editor.
  *
  * @param       editorView  The editor view.
- * @param       imageId     The id of image of the image that was pasted.
+ * @param       image The image that was pasted.
  *
  */
 - (void)editorView:(WPEditorView*)editorView