Skip to content

Commit 2413efa

Browse files
committed
Add more rich text pasteboard type exclusions.
1 parent 3afa01e commit 2413efa

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

Yippy.xcodeproj/project.pbxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,7 +1332,7 @@
13321332
CODE_SIGN_IDENTITY = "Apple Development";
13331333
CODE_SIGN_STYLE = Automatic;
13341334
COMBINE_HIDPI_IMAGES = YES;
1335-
CURRENT_PROJECT_VERSION = 1;
1335+
CURRENT_PROJECT_VERSION = 0;
13361336
DEVELOPMENT_TEAM = HY8YZ2D6M7;
13371337
ENABLE_HARDENED_RUNTIME = NO;
13381338
INFOPLIST_FILE = "Yippy/Supporting Files/Info.plist";
@@ -1341,7 +1341,7 @@
13411341
"@executable_path/../Frameworks",
13421342
);
13431343
MACOSX_DEPLOYMENT_TARGET = 10.13;
1344-
MARKETING_VERSION = 2.4.2;
1344+
MARKETING_VERSION = 2.5.0;
13451345
PRODUCT_BUNDLE_IDENTIFIER = MatthewDavidson.Yippy;
13461346
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
13471347
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1358,7 +1358,7 @@
13581358
CODE_SIGN_IDENTITY = "Apple Development";
13591359
CODE_SIGN_STYLE = Automatic;
13601360
COMBINE_HIDPI_IMAGES = YES;
1361-
CURRENT_PROJECT_VERSION = 1;
1361+
CURRENT_PROJECT_VERSION = 0;
13621362
DEVELOPMENT_TEAM = HY8YZ2D6M7;
13631363
ENABLE_HARDENED_RUNTIME = NO;
13641364
INFOPLIST_FILE = "Yippy/Supporting Files/Info.plist";
@@ -1367,7 +1367,7 @@
13671367
"@executable_path/../Frameworks",
13681368
);
13691369
MACOSX_DEPLOYMENT_TARGET = 10.13;
1370-
MARKETING_VERSION = 2.4.2;
1370+
MARKETING_VERSION = 2.5.0;
13711371
PRODUCT_BUNDLE_IDENTIFIER = MatthewDavidson.Yippy;
13721372
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
13731373
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1532,7 +1532,7 @@
15321532
CODE_SIGN_IDENTITY = "Apple Development";
15331533
CODE_SIGN_STYLE = Automatic;
15341534
COMBINE_HIDPI_IMAGES = YES;
1535-
CURRENT_PROJECT_VERSION = 1;
1535+
CURRENT_PROJECT_VERSION = 0;
15361536
DEVELOPMENT_TEAM = HY8YZ2D6M7;
15371537
ENABLE_HARDENED_RUNTIME = NO;
15381538
INFOPLIST_FILE = "Yippy/Supporting Files/Info.plist";
@@ -1541,7 +1541,7 @@
15411541
"@executable_path/../Frameworks",
15421542
);
15431543
MACOSX_DEPLOYMENT_TARGET = 10.13;
1544-
MARKETING_VERSION = 2.4.2;
1544+
MARKETING_VERSION = 2.5.0;
15451545
PRODUCT_BUNDLE_IDENTIFIER = MatthewDavidson.YippyBeta;
15461546
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
15471547
PRODUCT_NAME = "$(TARGET_NAME) Beta";
@@ -1657,7 +1657,7 @@
16571657
CODE_SIGN_IDENTITY = "Apple Development";
16581658
CODE_SIGN_STYLE = Automatic;
16591659
COMBINE_HIDPI_IMAGES = YES;
1660-
CURRENT_PROJECT_VERSION = 1;
1660+
CURRENT_PROJECT_VERSION = 0;
16611661
DEVELOPMENT_TEAM = HY8YZ2D6M7;
16621662
ENABLE_HARDENED_RUNTIME = NO;
16631663
INFOPLIST_FILE = "Yippy/Supporting Files/Info.plist";
@@ -1666,7 +1666,7 @@
16661666
"@executable_path/../Frameworks",
16671667
);
16681668
MACOSX_DEPLOYMENT_TARGET = 10.13;
1669-
MARKETING_VERSION = 2.4.2;
1669+
MARKETING_VERSION = 2.5.0;
16701670
PRODUCT_BUNDLE_IDENTIFIER = MatthewDavidson.YippyBeta;
16711671
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
16721672
PRODUCT_NAME = "$(TARGET_NAME) Beta";
@@ -1789,7 +1789,7 @@
17891789
CODE_SIGN_IDENTITY = "Apple Development";
17901790
CODE_SIGN_STYLE = Automatic;
17911791
COMBINE_HIDPI_IMAGES = YES;
1792-
CURRENT_PROJECT_VERSION = 1;
1792+
CURRENT_PROJECT_VERSION = 0;
17931793
DEVELOPMENT_TEAM = HY8YZ2D6M7;
17941794
ENABLE_HARDENED_RUNTIME = NO;
17951795
INFOPLIST_FILE = "Yippy/Supporting Files/Info.plist";
@@ -1798,7 +1798,7 @@
17981798
"@executable_path/../Frameworks",
17991799
);
18001800
MACOSX_DEPLOYMENT_TARGET = 10.13;
1801-
MARKETING_VERSION = 2.4.2;
1801+
MARKETING_VERSION = 2.5.0;
18021802
PRODUCT_BUNDLE_IDENTIFIER = MatthewDavidson.YippyXCTest;
18031803
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
18041804
PRODUCT_NAME = "$(TARGET_NAME)";

Yippy/Sources/Models/History/HistoryItem.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,20 @@ class HistoryItem: NSObject {
222222
}
223223
return false
224224
}
225+
226+
private let richTextPasteboardTypes = [
227+
NSPasteboard.PasteboardType.rtf.rawValue,
228+
NSPasteboard.PasteboardType.html.rawValue,
229+
"public.utf16-external-plain-text",
230+
]
225231
}
226232

227233
// MARK: - HistoryItem+NSPasteboardWriting
228234
extension HistoryItem: NSPasteboardWriting {
229235
func writableTypes(for pasteboard: NSPasteboard) -> [NSPasteboard.PasteboardType] {
230-
return types.filter{ HistoryItem.pastesRichText || $0 != .rtf } + [Self.historyItemIdType]
236+
return types.filter{
237+
HistoryItem.pastesRichText || !richTextPasteboardTypes.contains($0.rawValue)
238+
} + [Self.historyItemIdType]
231239
}
232240

233241
func pasteboardPropertyList(forType type: NSPasteboard.PasteboardType) -> Any? {

0 commit comments

Comments
 (0)