diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj index 4e9b42038..411386b4c 100644 --- a/Frameworks/AppKit/Browser.environment/AppKit.sj +++ b/Frameworks/AppKit/Browser.environment/AppKit.sj @@ -72070,7 +72070,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("initWithFrame:"), funct ,["void","CPEvent"])]); } (CPFontManager == null ? CPFontManager : (CPFontManager.isa.method_msgSend["setFontPanelFactory:"] || _objj_forward)(CPFontManager, "setFontPanelFactory:", (CPFontPanel.isa.method_msgSend["class"] || _objj_forward)(CPFontPanel, "class"))); -p;17;CPLayoutManager.jt;68575;@STATIC;1.0;i;8;CPText.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.ji;17;CPCompatibility.jt;68474;objj_executeFile("CPText.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPCompatibility.j", YES);_isNewlineCharacter = function(chr) +p;17;CPLayoutManager.jt;68995;@STATIC;1.0;i;8;CPText.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.ji;17;CPCompatibility.jt;68894;objj_executeFile("CPText.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPCompatibility.j", YES);_isNewlineCharacter = function(chr) { return chr === '\n' || chr === '\r'; } @@ -73314,9 +73314,12 @@ class_addMethods(the_class, [new objj_method(sel_getUid("glyphFrames"), function if (verticalOffset) { if (self._runs[i].view) - self._runs[i].view._frame.origin.y += verticalOffset; - if (self._runs[i].elem) - self._runs[i].elem.top = self._runs[i].elem.top + verticalOffset + 'px'; + { + var viewOrigin = ((___r1 = self._runs[i].view), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["frameOrigin"] || _objj_forward)(___r1, "frameOrigin")); + ((___r1 = self._runs[i].view), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setFrameOrigin:"] || _objj_forward)(___r1, "setFrameOrigin:", CGPointMake(viewOrigin.x, viewOrigin.y + verticalOffset))); + } + if (self._runs[i].elem && self._runs[i].elem.style.top) + self._runs[i].elem.style.top = parseFloat(self._runs[i].elem.style.top) + verticalOffset + 'px'; self._runs[i].DOMpatched = YES; } } @@ -73329,6 +73332,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("glyphFrames"), function { self._glyphsFrames[i].origin.y += verticalOffset; } + var ___r1; } ,["void","double","unsigned"])]); diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj index 4e9b42038..411386b4c 100644 --- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj +++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj @@ -72070,7 +72070,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("initWithFrame:"), funct ,["void","CPEvent"])]); } (CPFontManager == null ? CPFontManager : (CPFontManager.isa.method_msgSend["setFontPanelFactory:"] || _objj_forward)(CPFontManager, "setFontPanelFactory:", (CPFontPanel.isa.method_msgSend["class"] || _objj_forward)(CPFontPanel, "class"))); -p;17;CPLayoutManager.jt;68575;@STATIC;1.0;i;8;CPText.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.ji;17;CPCompatibility.jt;68474;objj_executeFile("CPText.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPCompatibility.j", YES);_isNewlineCharacter = function(chr) +p;17;CPLayoutManager.jt;68995;@STATIC;1.0;i;8;CPText.ji;11;CGContext.ji;14;CPTypesetter.ji;8;CPFont.ji;17;CPCompatibility.jt;68894;objj_executeFile("CPText.j", YES);objj_executeFile("CGContext.j", YES);objj_executeFile("CPTypesetter.j", YES);objj_executeFile("CPFont.j", YES);objj_executeFile("CPCompatibility.j", YES);_isNewlineCharacter = function(chr) { return chr === '\n' || chr === '\r'; } @@ -73314,9 +73314,12 @@ class_addMethods(the_class, [new objj_method(sel_getUid("glyphFrames"), function if (verticalOffset) { if (self._runs[i].view) - self._runs[i].view._frame.origin.y += verticalOffset; - if (self._runs[i].elem) - self._runs[i].elem.top = self._runs[i].elem.top + verticalOffset + 'px'; + { + var viewOrigin = ((___r1 = self._runs[i].view), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["frameOrigin"] || _objj_forward)(___r1, "frameOrigin")); + ((___r1 = self._runs[i].view), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setFrameOrigin:"] || _objj_forward)(___r1, "setFrameOrigin:", CGPointMake(viewOrigin.x, viewOrigin.y + verticalOffset))); + } + if (self._runs[i].elem && self._runs[i].elem.style.top) + self._runs[i].elem.style.top = parseFloat(self._runs[i].elem.style.top) + verticalOffset + 'px'; self._runs[i].DOMpatched = YES; } } @@ -73329,6 +73332,7 @@ class_addMethods(the_class, [new objj_method(sel_getUid("glyphFrames"), function { self._glyphsFrames[i].origin.y += verticalOffset; } + var ___r1; } ,["void","double","unsigned"])]); diff --git a/Resources/TextEditor/WORKLIST.md b/Resources/TextEditor/WORKLIST.md index 71b258ce6..d9e2ac21d 100644 --- a/Resources/TextEditor/WORKLIST.md +++ b/Resources/TextEditor/WORKLIST.md @@ -90,4 +90,5 @@ How the text system works, for the entries below: `CPTextView` does not use CSS - Edit > Insert Table Example: the sample table appears between the surrounding sentences, with its header row and its bold and italic cells. - Copy and paste within TextEditor with Command-C and Command-V, in one document and between documents: images, tables, including text edited in their cells, and lists are kept. - Table cells can be edited, as a first pass. +- Pasting text with several images and a table: the table appears in place at once, and tables, images and text below a change move with their lines. - Builds with both the legacy toolchain and capp-build. diff --git a/Resources/recipes.txt b/Resources/recipes.txt index f5eb983fb..13c2ba50c 100644 --- a/Resources/recipes.txt +++ b/Resources/recipes.txt @@ -1,150 +1,150 @@ -1792874619816|ArrayControllerInitialSelectionTest| -1792874619837|ArrayControllerRemovingFirstTest| -1792874619857|ArrayControllerTest| -1792874619878|AttachedSheet2Test| -1792874619898|AttachedSheetTest| -1792874619919|BindingContentArrayTest| -1792874619939|CGCanvasContextTest| -1792874619959|CGPathTest| -1792874619980|CPAlertTest| -1792874620985|CPAnimatablePropertyContainerTest| -1792874620212|CPAnimationContextTest| -1792874620414|CPAnimationTest| -1792874620614|CPBinderEchoBug| -1792874620812|CPBoxCibTest| -1792874620101|CPBoxTest| -1792874620121|CPBrowserTest| -1792874620141|CPButtonBarTest| -1792874620161|CPButtonKeyEquivalentDefaultTest| -1792874620182|CPButtonTest| -1792874620203|CPByteCountFormatterTest| -1792874620223|CPCollectionViewNibTest| -1792874620244|CPColorCPImageDescriptionTest| -1792874620265|CPColorWellBindingsTest| -1792874620285|CPComboBoxTest| -1792874620306|CPControlPerformClickExceptionTest| -1792874620326|CPControlSizeTest| -1792874620347|CPCursorTest| -1792874620367|CPDateFormatterTest| -1792874620388|CPDatePickerTest| -1792874620408|CPDictionaryControllerTest| -1792874620429|CPDocumentControllerTest| -1792874620449|CPFormatterTest| -1792874620470|CPGraphicsTest| -1792874620490|CPImageAndTextViewImageScalingTest| -1792874620511|CPImageViewAlignmentScaling| -1792874620531|CPImageViewTest| -1792874620551|CPImageViewbindingsTest| -1792874620572|CPLanguageModelChatbotTest| -1792874620593|CPLevelIndicator| -1792874620613|CPLevelIndicatorTest| -1792874620633|CPLocalizationTest| -1792874620654|CPLogTest| -1792874620675|CPMarkdownParserTest| -1792874620695|CPMenuCALayerTest| -1792874620716|CPMenuEnabledBindingsTest| -1792874620736|CPMenuKeyEquivalentsTest| -1792874620757|CPMenuRemoveAllTest| -1792874620778|CPMenuSubmenuPlacementConstraints| -1792874620799|CPMenuTest| -1792874620820|CPOutlineViewCibTest| -1792874620840|CPOutlineViewTest| -1792874620860|CPOutlineViewViewBasedCibTest| -1792874620881|CPPanelTest| -1792874620902|CPPlatformWindow| -1792874620922|CPPlattformWindowMinSize| -1792874620943|CPPopUpButtonBindingsTest| -1792874620963|CPPopUpButtonTest| -1792874620984|CPPopoverTest| -1792874621477|CPPredicateEditorCibTest| -1792874621256|CPProgressIndicatorTest| -1792874621465|CPPropertyListSerializationTest| -1792874621673|CPRadioBindingsTest| -1792874621880|CPRuleEditorCibTest| -1792874621108|CPRuleEditorTest| -1792874621129|CPScrollView2Test| -1792874621150|CPScrollViewTest| -1792874621171|CPSearchFieldPredicateBinding| -1792874621192|CPSearchFieldTest| -1792874621213|CPSegmentedControlBindingsTest| -1792874621235|CPSegmentedControlTest| -1792874621256|CPSoundTest| -1792874621277|CPSplitViewDividerTest| -1792874621298|CPSplitViewTest| -1792874621319|CPStackViewTest| -1792874621341|CPStepperBindingsTest| -1792874621363|CPStepperNibTest| -1792874621389|CPTabView2Test| -1792874621412|CPTabViewBindingsTest| -1792874621434|CPTabViewNibTest| -1792874621455|CPTableViewGroupRowsTest| -1792874621476|CPTextFieldEditingStyleTest| -1792874621500|CPTextFieldHeightTest| -1792874621528|CPTextFieldMovementsTest| -1792874621552|CPTextFieldMultiLineTest| -1792874621573|CPTextFieldTest| -1792874621594|CPTextViewCibTest| -1792874621615|CPTextViewDelegateAndNotificationsTest| -1792874621636|CPTimeZoneTest| -1792874621658|CPTokenFieldTest| -1792874621679|CPToolTipTest| -1792874621700|CPToolbarTest| -1792874621721|CPTreeControllerTest| -1792874621742|CPURLConnectionAsyncTest| -1792874621762|CPURLConnectionSynchronousTest| -1792874621783|CPUserDefaultsControllerTest| -1792874621804|CPUserDefaultsTest| -1792874621825|CPUserNotificationTest| -1792874621846|CPViewControllerTest| -1792874621867|CPVisualEffectViewTest| -1792874621887|CPWebViewTest| -1792874621908|CPWebViewTest2| -1792874621929|CPWindowLiveResizeTest| -1792874621953|CPWindowMovableTest| -1792874621977|CPWindowResizeStyleTest| -1792874621998|ChildWindowsTest| -1792874622196|CompilationTests| -1792874622405|ContinuouslyUpdatesValueBinding| -1792874622611|CopyAndPasteTest| -1792874622819|CrossOriginTest| -1792874622102|FF4096Test| -1792874622122|FontEnhancementTest| -1792874622143|FontMetricsExplorerTest| -1792874622163|KeyEquivalentsTest| -1792874622184|KeyViewLoopTest| -1792874622204|KeyWindowInTheBackgroundActivation| -1792874622225|LayoutTest| -1792874622246|LoadDynamicFrameworksTest| -1792874622266|LoadTimeTest| -1792874622287|LongBindingsTest| -1792874622307|MobileTest| -1792874622328|MultipleValueBindingsTest| -1792874622348|NSBoxTest| -1792874622368|NSBrowserTest| -1792874622389|NewTextFieldBezelTest| -1792874622409|Nib2CibAlignmentTest| -1792874622430|Nib2CibBaselineAlignementTest| -1792874622450|Nib2CibSubviewsOrderTest| -1792874622470|NibAppRemixedTest| -1792874622491|PatternFillTest| -1792874622511|PlatformWindowsTest| -1792874622531|PopUpButtonEscTest| -1792874622551|PredicateWithFormatTest| -1792874622571|ResignFirstResponderWithCPControlTextDidEndEditingTest| -1792874622591|Scaling2Test| -1792874622611|ScalingTest| -1792874622631|ScrollviewThemingTest| -1792874622652|SimpleBindings2Test| -1792874622672|SizeToFitTest| -1792874622692|SmartFoldersDemo| -1792874622713|SmartFoldersTest| -1792874622733|TableTest| -1792874622753|TextEditor| -1792874622774|ThemeBrowserTest| -1792874622795|ThemeKitchenSinkTest| -1792874622816|TrackingAreaTest| -1792874622837|UndoRedoWithMenuUpdateTest| -1792874622857|UserlandNSTest| -1792874622878|WindowSheetOrderTest| -1792874622899|layoutEphemeralSubviewTest| -1792874622920|performKeyEquivalentTest| +1792877843178|ArrayControllerInitialSelectionTest| +1792877843199|ArrayControllerRemovingFirstTest| +1792877843219|ArrayControllerTest| +1792877843239|AttachedSheet2Test| +1792877843258|AttachedSheetTest| +1792877843278|BindingContentArrayTest| +1792877843298|CGCanvasContextTest| +1792877843319|CGPathTest| +1792877843339|CPAlertTest| +1792877843361|CPAnimatablePropertyContainerTest| +1792877843383|CPAnimationContextTest| +1792877843403|CPAnimationTest| +1792877843423|CPBinderEchoBug| +1792877843443|CPBoxCibTest| +1792877843464|CPBoxTest| +1792877843483|CPBrowserTest| +1792877843503|CPButtonBarTest| +1792877843523|CPButtonKeyEquivalentDefaultTest| +1792877843543|CPButtonTest| +1792877843563|CPByteCountFormatterTest| +1792877843584|CPCollectionViewNibTest| +1792877843604|CPColorCPImageDescriptionTest| +1792877843625|CPColorWellBindingsTest| +1792877843645|CPComboBoxTest| +1792877843666|CPControlPerformClickExceptionTest| +1792877843686|CPControlSizeTest| +1792877843705|CPCursorTest| +1792877843725|CPDateFormatterTest| +1792877843746|CPDatePickerTest| +1792877843766|CPDictionaryControllerTest| +1792877843786|CPDocumentControllerTest| +1792877843806|CPFormatterTest| +1792877843826|CPGraphicsTest| +1792877843847|CPImageAndTextViewImageScalingTest| +1792877843867|CPImageViewAlignmentScaling| +1792877843887|CPImageViewTest| +1792877843907|CPImageViewbindingsTest| +1792877843927|CPLanguageModelChatbotTest| +1792877843947|CPLevelIndicator| +1792877843966|CPLevelIndicatorTest| +1792877843986|CPLocalizationTest| +1792877844678|CPLogTest| +1792877844269|CPMarkdownParserTest| +1792877844469|CPMenuCALayerTest| +1792877844670|CPMenuEnabledBindingsTest| +1792877844869|CPMenuKeyEquivalentsTest| +1792877844107|CPMenuRemoveAllTest| +1792877844127|CPMenuSubmenuPlacementConstraints| +1792877844147|CPMenuTest| +1792877844167|CPOutlineViewCibTest| +1792877844187|CPOutlineViewTest| +1792877844207|CPOutlineViewViewBasedCibTest| +1792877844227|CPPanelTest| +1792877844247|CPPlatformWindow| +1792877844268|CPPlattformWindowMinSize| +1792877844288|CPPopUpButtonBindingsTest| +1792877844308|CPPopUpButtonTest| +1792877844328|CPPopoverTest| +1792877844348|CPPredicateEditorCibTest| +1792877844368|CPProgressIndicatorTest| +1792877844389|CPPropertyListSerializationTest| +1792877844409|CPRadioBindingsTest| +1792877844429|CPRuleEditorCibTest| +1792877844449|CPRuleEditorTest| +1792877844469|CPScrollView2Test| +1792877844489|CPScrollViewTest| +1792877844509|CPSearchFieldPredicateBinding| +1792877844529|CPSearchFieldTest| +1792877844550|CPSegmentedControlBindingsTest| +1792877844570|CPSegmentedControlTest| +1792877844591|CPSoundTest| +1792877844611|CPSplitViewDividerTest| +1792877844631|CPSplitViewTest| +1792877844651|CPStackViewTest| +1792877844671|CPStepperBindingsTest| +1792877844692|CPStepperNibTest| +1792877844712|CPTabView2Test| +1792877844732|CPTabViewBindingsTest| +1792877844752|CPTabViewNibTest| +1792877844772|CPTableViewGroupRowsTest| +1792877844792|CPTextFieldEditingStyleTest| +1792877844812|CPTextFieldHeightTest| +1792877844832|CPTextFieldMovementsTest| +1792877844852|CPTextFieldMultiLineTest| +1792877844872|CPTextFieldTest| +1792877844892|CPTextViewCibTest| +1792877844911|CPTextViewDelegateAndNotificationsTest| +1792877844931|CPTimeZoneTest| +1792877844951|CPTokenFieldTest| +1792877844971|CPToolTipTest| +1792877844991|CPToolbarTest| +1792877845108|CPTreeControllerTest| +1792877845303|CPURLConnectionAsyncTest| +1792877845498|CPURLConnectionSynchronousTest| +1792877845697|CPUserDefaultsControllerTest| +1792877845898|CPUserDefaultsTest| +1792877845109|CPUserNotificationTest| +1792877845129|CPViewControllerTest| +1792877845149|CPVisualEffectViewTest| +1792877845169|CPWebViewTest| +1792877845188|CPWebViewTest2| +1792877845208|CPWindowLiveResizeTest| +1792877845228|CPWindowMovableTest| +1792877845247|CPWindowResizeStyleTest| +1792877845267|ChildWindowsTest| +1792877845287|CompilationTests| +1792877845306|ContinuouslyUpdatesValueBinding| +1792877845326|CopyAndPasteTest| +1792877845346|CrossOriginTest| +1792877845366|FF4096Test| +1792877845386|FontEnhancementTest| +1792877845406|FontMetricsExplorerTest| +1792877845426|KeyEquivalentsTest| +1792877845445|KeyViewLoopTest| +1792877845465|KeyWindowInTheBackgroundActivation| +1792877845485|LayoutTest| +1792877845504|LoadDynamicFrameworksTest| +1792877845524|LoadTimeTest| +1792877845544|LongBindingsTest| +1792877845564|MobileTest| +1792877845583|MultipleValueBindingsTest| +1792877845603|NSBoxTest| +1792877845623|NSBrowserTest| +1792877845642|NewTextFieldBezelTest| +1792877845662|Nib2CibAlignmentTest| +1792877845682|Nib2CibBaselineAlignementTest| +1792877845702|Nib2CibSubviewsOrderTest| +1792877845722|NibAppRemixedTest| +1792877845741|PatternFillTest| +1792877845761|PlatformWindowsTest| +1792877845781|PopUpButtonEscTest| +1792877845801|PredicateWithFormatTest| +1792877845821|ResignFirstResponderWithCPControlTextDidEndEditingTest| +1792877845841|Scaling2Test| +1792877845861|ScalingTest| +1792877845880|ScrollviewThemingTest| +1792877845900|SimpleBindings2Test| +1792877845921|SizeToFitTest| +1792877845941|SmartFoldersDemo| +1792877845961|SmartFoldersTest| +1792877845981|TableTest| +1792877846118|TextEditor| +1792877846214|ThemeBrowserTest| +1792877846416|ThemeKitchenSinkTest| +1792877846621|TrackingAreaTest| +1792877846826|UndoRedoWithMenuUpdateTest| +1792877846102|UserlandNSTest| +1792877846123|WindowSheetOrderTest| +1792877846144|layoutEphemeralSubviewTest| +1792877846164|performKeyEquivalentTest|