Commit Graph
5091 Commits
Author SHA1 Message Date
Adlai Holler 835acd6a25 Change assumed value for text node highlighting delegate method to YES and don't consult it unless highlighting. 2015-12-03 20:52:02 -08:00
appleguy 61f2f73b16 Merge pull request #910 from Adlai-Holler/FixMovingLinkTouches
Allow User to Move While Touching Link As Long As They Stay In Range
2015-12-03 10:58:54 -08:00
Adlai Holler f39105a8f4 Optimize 2015-12-03 09:45:45 -08:00
Adlai Holler f723452756 Allow link taps to continue if touches move within the same link 2015-12-03 09:25:37 -08:00
Aaron Schubert e1b50ce77a Fix merge conflicts 2015-12-03 14:23:27 +00:00
Aaron Schubert 630bd23820 Merge branch 'master' into ASMapNode 2015-12-03 14:22:45 +00:00
Aaron Schubert 945e6fdb44 Revert accidental changes to Kittens example. Apologies @nguyenhuy ! 2015-12-03 11:28:10 +00:00
Aaron Schubert 79b4c95749 Substantially improved ASMapNode and made it a lot clearer and less complex internally. 2015-12-03 11:22:05 +00:00
Adlai Holler 73b90023dc Merge branch 'master' into update-objc 2015-12-01 22:16:36 -08:00
Adlai Holler 1fd65c2f25 Annotate ASAsciiArtBoxCreator.h 2015-12-01 21:57:45 -08:00
appleguy e42bcf47be Merge pull request #901 from Adlai-Holler/ModernizeCellLoading
ASTableView: Use Fancy dequeueReusableCellWithIdentifier:forIndexPath: Method
2015-12-01 17:54:45 -08:00
Scott Goodson 3b6b48175d Fix for an incorrect assertion firing when transforming an ASLayoutSpec-positioned node. 2015-12-01 17:49:11 -08:00
Scott Goodson ee917ae210 Disable verbose logging, re-enable working window to merge WIP and avoid conflicts. 2015-12-01 16:48:59 -08:00
Adlai Holler 8e75c594c7 Add some more annotations 2015-12-01 16:48:55 -08:00
Adlai Holler fdfe18873a Merge branch 'master' into update-objc
Conflicts:
	AsyncDisplayKit/ASDisplayNodeExtras.h
	AsyncDisplayKit/Details/ASTextNodeRenderer.h
	AsyncDisplayKit/Details/ASTextNodeShadower.h
2015-12-01 16:45:25 -08:00
Scott Goodson 8bc65a9624 A few more debug changes for the removal of the working window. 2015-12-01 12:01:16 -08:00
Adlai Holler e1d06e70ff Fix constant naming 2015-12-01 12:00:38 -08:00
appleguy f669dddd88 Merge pull request #903 from JohnWong/master
Update video links in docs
2015-12-01 11:50:27 -08:00
John Wong c975c03542 Update video links in docs 2015-12-02 01:43:56 +08:00
Adlai Holler ec682db8d7 Fix name 2015-11-30 23:24:57 -08:00
Adlai Holler 1f8df4ffec Use shiny new dequeueReusableCellWithIdentifier:forIndexPath: method in ASTableView 2015-11-30 23:22:53 -08:00
Adlai Holler 0ee1fd82dc Refactor nodeDidRelayoutWithSizeChange: -> nodeDidRelayout:sizeChanged: 2015-11-30 19:29:27 -08:00
Scott Goodson 9669f147ba Efficiency improvements to consolidate display events for the window-less preload range. 2015-11-30 19:02:16 -08:00
Scott Goodson 7f59beb195 Initial experimental commit with functioning preloading, without the working window. 2015-11-30 19:01:57 -08:00
appleguy 771eca5083 Merge pull request #825 from levi/levi/text-renderer
Update ASTextNode renderer with the latest derivative of it developed for ComponentKit
2015-11-30 18:52:21 -08:00
Adlai Holler 04d93532bc Only require node sizes once per run loop, and only if a node's size has changed 2015-11-30 17:20:32 -08:00
Levi McCallum 5465d44383 Include visible range handler implementation file in iOS project 2015-11-30 17:08:01 -08:00
Levi McCallum 625b6cc373 Add ASRangeHandlerVisible.h to iOS project 2015-11-30 15:53:10 -08:00
Levi McCallum 309914052f Fix broken build with visible range handler file reference 2015-11-30 15:37:47 -08:00
Levi McCallum 04ad021daa Rename positioning block to sport as namespace 2015-11-30 06:55:32 -08:00
Levi McCallum 9d327cd14f Remove fixme from test 2015-11-30 06:54:51 -08:00
Levi McCallum cd78bcce99 Convert naming of hash helpers to AS namespace 2015-11-30 06:53:50 -08:00
Levi McCallum 82848d6c23 Add TextKit classes to iOS framework target 2015-11-30 06:48:10 -08:00
Levi McCallum af60009992 Update social app to use new text node API 2015-11-30 06:46:53 -08:00
Levi McCallum 52b6c47d23 Allow resizing TextKit tests to pass by taking into account imprecision 2015-11-30 06:46:53 -08:00
Levi McCallum 2cf4b22c96 Include correct TextKit headers 2015-11-30 06:46:53 -08:00
Levi McCallum 8114fc4f46 Bring over core TextKit Truncation and Renderer tests from CK 2015-11-30 06:46:52 -08:00
Levi McCallum c1f4456fd5 Use composed attributed truncation string for underlying drawing text 2015-11-30 06:44:53 -08:00
Levi McCallum a8e6aebe9c Remove public header exposure of text kit internals 2015-11-30 06:44:53 -08:00
Levi McCallum 197a31f636 Fix mistakenly renamed method in unit test 2015-11-30 06:44:53 -08:00
Levi McCallum 397e5b15e9 Fix tabbing on initializer 2015-11-30 06:44:53 -08:00
Levi McCallum a0c05ebffc Rename CK classes to AS classes 2015-11-30 06:44:53 -08:00
Levi McCallum de66819286 Implement functioning isTruncated API on ASTextNode 2015-11-30 06:41:41 -08:00
Levi McCallum 74435fb584 Convert ASTextNode to support CKTextKitRenderer 2015-11-30 06:41:41 -08:00
Levi McCallum 275fd3eddd Include missing hash helpers implementation 2015-11-30 06:41:40 -08:00
Levi McCallum bae3e3b63d Add latest ComponentKit text kit renderer into project 2015-11-30 06:41:40 -08:00
Scott Goodson 9032962353 Nuke the curly quotes - omg y must u curly 1.9.2 2015-11-29 22:39:59 -08:00
appleguy 937b72b64a Merge pull request #879 from levi/levi/custom-layout-example
Add custom collection view layout example project
2015-11-29 22:14:31 -08:00
appleguy 171160564a Merge pull request #895 from Adlai-Holler/Cleanup894
Cleanup PR 894
2015-11-29 22:01:04 -08:00
Scott Goodson df11ea8b34 Podspec 1.9.2 version bump. 2015-11-29 21:50:57 -08:00