wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-16 02:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1740 commits 161 branches 1 tag 190 MiB
Commit graph

301 commits

Author SHA1 Message Date
Christian Williams 80ed03f2a2 Support for copying 
Change-Id: Icf4665f9c48896e26cb536af033ca55410af49db
 2012-05-25 12:02:56 -07:00
Inez Korczynski 8f4f076340 Added handles for mouse events (down, up, move). Implemented method SurfaceView.getOffset and applied significant fixes to SurfaceView.getDOMNodeAndOffset. 
Change-Id: I06cbfa9e0e7afc7aaf19d5cda8b91fe93aeb51f8
 2012-05-24 20:55:45 -07:00
Inez Korczynski afe18a685a Fix methods getNearestStructuralOffset and getNearestContentOffset for case of passing offsets that are already structural or content 
Change-Id: I23cd2daab9cef181b01131b3b9c6ead5ec47f9f4
 2012-05-24 20:53:50 -07:00
Inez Korczynski b56b6bad6d Just for purpose of testing add some hardcoded border and cellspacing to all tables 
Change-Id: I97ff937d7e7d6a91ee3f411d7f77d5e3798ba567
 2012-05-24 20:51:31 -07:00
Inez Korczynski 6017050b3f Add class ve-ce-imageNode to all image nodes, also comment out mousedown event handler 
Change-Id: I7565d8822bbe0547e731df1859cdde4ac78de6f2
 2012-05-24 20:50:36 -07:00
Trevor Parscal ea9191b5b4 Copied CSS styles from ve to ve2 
Change-Id: Iabd5ee3edde5747952c4b78ef6e9cd5949016050
 2012-05-24 15:15:29 -07:00
Christian Williams 0a3b5df6de Image nodes are not draggable 
Change-Id: Ie1080045939af7c9b7ac8c30527ad6057fe7e3f6
 2012-05-24 15:10:16 -07:00
Christian Williams 88e25e77f2 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-24 14:47:41 -07:00
Christian Williams 1cc8aca16d Using invisible space character in slugs 
Change-Id: I36752f4bea96bad61dedfbbb4fc00422d773227b
 2012-05-24 14:47:24 -07:00
Trevor Parscal f6eef19021 Added copying of .data( 'node' ) from old wrappers to new wrappers on wrapper updates 
Change-Id: Ibd9535bd9ebb712910d963eedc5941f8512aaf8d
 2012-05-24 14:01:42 -07:00
Trevor Parscal c8ccdb9813 Moved ve.ve.BranchNode.canNodeHaveSlug to ve.ce.Node.prototype.canHaveSlug 
Change-Id: I6d5d9ca5a1c9878acb15e9526feb94986822b491
 2012-05-24 14:01:17 -07:00
Trevor Parscal ebfafac3e2 Added missing documentation to methods in ve.ce.BranchNode 
Change-Id: If6833e3d639e0455025762987b7f41a43892ca4a
 2012-05-24 13:22:57 -07:00
Christian Williams 933ff678a4 Focus can now be set in slugs using showCursor or showSelection. 
Change-Id: I12ab361a30d277a4752579bf885fd37bc46b32ed
 2012-05-24 13:18:30 -07:00
Trevor Parscal 3ce705313e Replaced static array with real logic inside of ve.ce.BranchNode.canNodeHaveSlug 
Also added more static config getters and fixed some typos in prototype definitions

Change-Id: Ib9093a625b944e6a4ca4da50c51fb475b5895b8d
 2012-05-24 13:12:45 -07:00
Trevor Parscal e150ba2e54 Moved "is slug gable" functionality to a static method of ve.ce.BranchNode 
Also optimized some query stuff

Change-Id: I5675258c6e276a1ba410dcf1ee111392140a04eb
 2012-05-24 11:58:33 -07:00
Trevor Parscal c9dddf60da Made getRelativeOffset return -1 if no valid offset is found in document 
Change-Id: If4cef5fe800b241c3efe1d27cdf01cd1ceef2248
 2012-05-24 11:43:47 -07:00
Trevor Parscal 1ddaec8acb Added getRelativeOffset and several wrappers around it 
Change-Id: Ifd10922366650165bc4c21ea8cfdd2f9b7163432
 2012-05-23 17:43:24 -07:00
Trevor Parscal 541d786ced Added optional "unrestricted" argument to isStructuralOffset 
Using this argument will only return true if the offset is a place you can add any element to (hence the unrestricted part of it). This is good for testing if a paragraph could potentially be inserted there.

Change-Id: I6cc91da437c52493de03eb687b28966198270fea
 2012-05-23 14:56:33 -07:00
Inez Korczynski fe1482e0c4 Added method proxy to ve.ce.Surface 
Change-Id: I2373df4c738b49685a897c8e13acebdd7ccb3e00
 2012-05-23 13:34:52 -07:00
Inez Korczynski bea881daca Refactor mechanism of adding slugs in before and after particular nodes in branch 
Change-Id: I8b3f4a9b27ff09d569f366c32f96e7e8191487c0
 2012-05-23 13:24:49 -07:00
Catrope cce32103ff Implement newFromInsertion() 
Mostly just wraps around fixupInsertion()

Change-Id: I5c9128439b9ed29b112590c0004a749f9b529346
 2012-05-23 12:45:28 -07:00
Catrope 3be3f55c91 Rough first stab at ve.dm.fixupInsertion() 
This code still needs a lot of work, but it seems to work for most
cases. Things that still need to be done:
* Documentation and comments
* Handling of content and text nodes
** Use Trevor's isContent/canContainContent code which I don't have yet
* Preserve attributes when reopening closed elements
* Tests :)

Change-Id: I3bc16c964ef158693490a61ce12beb21e6fe2a9d
 2012-05-23 12:45:28 -07:00
Catrope 9a1ec62f0d Remove pushInsert() and pushRemove() 
The 'insert' and 'remove' operations weren't implemented in the
transaction processor and were a holdover from the old DM
implementation.

Also migrated the tests, especially those that asserted that consecutive
insert/remove operations were combined (this is no longer the case now
that they are replace operations)

Change-Id: I2379fe92b331c5316f70f4b695397da41581cce9
 2012-05-23 12:45:27 -07:00
Christian Williams 32b9ccd0bf Moving alien node styling to CSS file 
Change-Id: I21e4593b81669b48cec831236398866f89616f9a
 2012-05-23 12:03:28 -07:00
Trevor Parscal 9af03a29b1 Updated demo and fixed HTML converter 
Removed hard-coding of alien nodes, now aliens are automatically used for anything unknown, and block or inline aliens are selected based on whether the parent element can contain content or not.

Change-Id: I5d2a521ead4f4c96cb44d084a5c160cc20d8048e
 2012-05-23 10:15:44 -07:00
Trevor Parscal 86591e5325 Restructured static node rules 
Change-Id: I7023e1f334694d59767491f1010e7c4c59c0ce54
 2012-05-21 17:39:12 -07:00
Rob Moen 0b9411c531 Cleanup Sanxbox.js 
Change-Id: Id8ba1aacecdbb5d31888e289d23ab03a16346c60
 2012-05-21 17:03:57 -07:00
Rob Moen 95e06e96bf Prepare for MediaWiki integration 
Create context instance in surface.
Move over getSelectionRect into ce.surface
Cleanup ve.surface contstructor class
Move linmod/html test objects to sandbox.js

Change-Id: I0cf602ef991100bf6128c68750b02a00566911dc
 2012-05-21 16:06:30 -07:00
Rob Moen 7bf15b4377 Copy ui modules to ve2 
Switch sandbox demo to use new ui modules
Update VisualEditor.php to use ve2 modules
SpecialPageSandbox working

Change-Id: I8261d6bf6ceb6ae7b7bfa5f61aec6a0121906765
 2012-05-21 12:39:36 -07:00
Trevor Parscal c38a552442 Fixed case on mapping to $.toJSON 
* Also made uses of JSON.stringify use ve.getHash

Change-Id: I05dc0374e05b72c798ae0fd44239e5f8bb45ca52
 2012-05-21 12:21:07 -07:00
Rob Moen 272f502693 Modify getAnnotationsFromOffset to account for annotated leaf nodes. 
Refactor remaining annotation methods
Refactor tests to use correct annotation types

Change-Id: Ia3ce42b3d11296b4d63277e0e2a1997d23236613
 2012-05-21 12:02:04 -07:00
Christian Williams b7afcff62a Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-18 15:20:01 -07:00
Christian Williams 6d15028c68 Making showCursor work again! 
Change-Id: I97e1570ffba368e570b69085daa2798b8b2725f9
 2012-05-18 15:19:31 -07:00
Rob Moen f19c5917f2 remove hasChildren method as I was using it to debug something on 
previous commit.  change traverseLeafNode test name to follow
ve2 test naming scheme

Change-Id: I8b953e3405f42cd58a80da676ac9b16d64f5e72d
 2012-05-18 14:11:23 -07:00
Rob Moen e4a7a36761 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-18 13:48:03 -07:00
Rob Moen 62959bec7a ported traverseLeafNodes and tests to new dm 
Change-Id: I98487267d6e3efc9e0c07a02b3d5acc8f8cdb4c6
 2012-05-18 13:47:14 -07:00
Inez Korczynski 19a02f3798 Disable objectResizing and inlineTableEditing within execCommand 
Change-Id: I06406bfd56e01e72b157fd8cb50da8d6173edc25
 2012-05-18 11:40:22 -07:00
Inez Korczynski 32c2366dca Logic for adding 'slugs' before, after and between nodes in certain cases 
Change-Id: I91a1c58bdb7819503a9eb24221d6a358c804b57e
 2012-05-18 11:34:07 -07:00
Trevor Parscal 4dd9a143ae Added newFromAttributeChange and newFromAnnotation 
Change-Id: I1e85ccee3fa1591867fea52359508bfa99bad7df
 2012-05-17 15:17:17 -07:00
Trevor Parscal 445006d4a8 Made tests a bit stricter before iterating over annotations 
Change-Id: I7c7f11395cfb4ad392bad9380119b647c0c1b629
 2012-05-17 14:58:01 -07:00
Trevor Parscal 43d62ee8a7 Refactored getMatchingAnnotations and it's tests, and added offsetContainsMatchingAnnotations 
Change-Id: I9098ef8d9c7f3a4f5db112cfdcb9edb7ffd17b80
 2012-05-17 14:37:29 -07:00
Rob Moen a937ad22f7 Fix getAnnotatedRange to return propper contained range. 
Fixed tests

Change-Id: I305eb81644fb3c804455b4fc13bdabcce97ea471
 2012-05-17 13:17:18 -07:00
Trevor Parscal 24c35b853f Whitespace fixes 
Change-Id: I691c4e16cf22de8dce0858cdcad522d1f6cfef72
 2012-05-17 11:27:25 -07:00
Trevor Parscal 08765feab3 Merged ve.dm.DocumentFragment and ve.dm.Document 
* Also fixed lots of whitespace issues and some global variable introductions

Change-Id: Ia6c82ef0c3b5c4938cf72afa86da6d79e4cb385a
 2012-05-17 11:23:56 -07:00
Trevor Parscal e8f15204e5 Added skeletons for transaction builders 
Change-Id: Iabb2707d20c8b645ffef683f9d8160911c6dc92f
 2012-05-17 10:51:01 -07:00
Rob Moen c2a89626d5 Rewrite getMatchingAnnotations to return a hashmap of matching anntations 
in the new DM.  Change method name getAnnotationRange from offset to
getAnnotatedRangeFromOffset.  Write tests

Change-Id: I7028803065409e271ceced73e4803954d4a956dc
 2012-05-17 10:46:27 -07:00
Trevor Parscal 58aa0e8137 Whitespace fixes and cleanup 
Change-Id: Id2220009ed7af7e895990dd4bb373b43d6089b7b
 2012-05-16 20:26:05 -07:00
Catrope bcd7431818 Remove getScope(), no longer used 
Change-Id: I79e067a8e6b3eb151d3ebe1dfc3aaebe242aed39
 2012-05-16 20:16:47 -07:00
Catrope 80db7a593e Rethink of structural replacement code 
Splits and merges now work, or at least the tests for it pass

The strategy I used is to gather the affected ranges for each of the
following:
* removed stuff
* the entirety of each node touched by a non-zero removal
* if the inserted data busts out of its parent, the entirety of that
  parent node (the 'scope')
then get the covering range of all those ranges, and rebuild that.

Change-Id: I7c3b421abc0ba134157ac8b59042675bb1b5073c
 2012-05-16 16:48:02 -07:00
Catrope 5e4f0293f2 Add ve.Range.coveringRange() 
Change-Id: Ifd9932d7a9f9dae2354fa7aa75cee2e3e639ef42
 2012-05-16 16:48:02 -07:00
Catrope 6f4b68274d Rename removeLevel to insertLevel 
Change-Id: I339c830547d19af0b04927e1ebccd0468c9e2a20
 2012-05-16 16:48:02 -07:00
Rob Moen fbaea888b9 Rewrite data model methods needed for ui tools 
getAnnotationRangeFromOffset and offsetContainsAnnotation
which deprecated getAnnotationBoundaries, and getIndexOfAnnotation
write unit tests for proof

Change-Id: I6c0d4e3ca96dd569b1909cd22fce68c3a6fe382c
 2012-05-16 15:55:01 -07:00
Catrope d6cf4fff7f Add comment about bug that makes tests accidentally pass 
Change-Id: I842ffe00bdad025797f9c71f550efd24d2ce39da
 2012-05-14 23:16:28 -07:00
Catrope 7e1aa2336e Support splitting nodes in replace tree sync 
This means inserting things like </p><p> are now synced correctly and
split the paragraph in the model tree. Merges (removing e.g. </p><p>)
aren't supported yet.

Also, this needs tests, Trevor tells me he's working on porting replace
tests from the old ve/ directory

Change-Id: Ic5050849d7d007a1696dc36548654979aedb53a8
 2012-05-14 21:46:39 -07:00
Catrope 59f74de3b8 Fix bug causing replacement tree sync to adjust the wrong node 
The tree sync for content replacements was adjusting the parent of the
text node affected, rather than the text node itself. This was because
it called getNodeFromOffset(), which returns branch nodes. Switched it
to use selectNodes() in leaves mode

Change-Id: I50a9be18151a1b75815ab19b787b16b6be385bf9
 2012-05-14 21:42:53 -07:00
Catrope 2008858830 Fix bug in selectNodes: input (0,0) returned [] 
This was because the while loop was never entered as end >= left was
true from the start. Convert the while loop to a do-while loop to make
sure it runs at least once

Change-Id: I9c6436a7b296e65a36b8301095b6edd00507d321
 2012-05-14 21:41:08 -07:00
Trevor Parscal e28a1a188a Fixes typo, need to check if object is empty, not if it's an object 
Related to: 14a4c7b780

Change-Id: Iede66d1e01ed010705362611e90fb4b13e7e4a1c
 2012-05-14 17:22:37 -07:00
Trevor Parscal 14a4c7b780 Fixed annotation processing to support leaf nodes and detect more errors 
Also added lots of tests

Change-Id: I45fe4fb569d9050d7d79f71f777d82f5b34fdd11
 2012-05-14 17:16:30 -07:00
Trevor Parscal 94613589e0 Removed more trailing whitespace in multi-line comment blocks 
Continues cleanup work done in e0de881a8a

Change-Id: I7165a8f8c4b468793d936fe695de92335c106271
 2012-05-14 17:16:30 -07:00
Rob Moen 68414e4d28 give array bulider loop better names 
Change-Id: I67f5b89b3e58f052c197732a1298c60ec6b8fd89
 2012-05-14 16:48:10 -07:00
Rob Moen ca48a4a8a1 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-14 16:44:08 -07:00
Rob Moen d2fc95fa52 Optimize getAnnotationsFrom dramatically by less object manipulation 
Now returning an empty array when a non annotated character is found
in the range.  No longer looping through each annotation, simply
comparing to previous characters annotations and trimming differences.
Write additional test.

Change-Id: I41d2422a931a74325693edca409aed6d5da20ba8
 2012-05-14 16:40:49 -07:00
Catrope 5b398f95f8 Fix botched rename: opReplacement -> opInsert 
Change-Id: I34091dbbc9a46466823ee7407f151fd67112ee03
 2012-05-14 15:12:44 -07:00
Trevor Parscal e0de881a8a Removed trailing whitespace in multi-line comment blocks 
JSHint and various git tools complain about this, so let's just do away with them altogether

Change-Id: I731866bd21f1ee0088fb0a71df3abf92692aca23
 2012-05-14 15:05:09 -07:00
Trevor Parscal 03be3c0668 Removed debugger statement from 5b9a2645a6 
Change-Id: I047b0c89a7420a86b9350a8d0c0fc8aec695227f
 2012-05-14 14:34:50 -07:00
Rob Moen 17b58db5c6 Optimize getAnnotationsFromOffset with ve.getObjectValues 
Change-Id: I2150335b6f0fa305c1d1bc93e50d30d874c76345
 2012-05-14 11:34:08 -07:00
Trevor Parscal f40e4f2f9d Added ve.getObjectValues 
Could maybe be optimized with map or something?

Change-Id: I033804e893bfa93f991dee9efefaa2c2d1740627
 2012-05-14 11:31:18 -07:00
Trevor Parscal d7febe6009 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-14 11:15:02 -07:00
Trevor Parscal 1363e7ff89 Added ve.getObjectKeys which falls back to Object.keys if present 
Change-Id: I9eedf93239b22497fe6fe6497e20b1fe0525de9c
 2012-05-14 11:14:54 -07:00
Rob Moen b8302c715f Rewrite getAnnotationsFromOffset to work with new Linear Model. 
Properly init variables in getAnnotationsFromRange
Polish up tests.

Change-Id: Idc231998ce27e3a1c64363e862da22c837ea2ca2
 2012-05-14 10:47:48 -07:00
Rob Moen bd9a0b6fba Rewrite DocumentFragment getAnnotationsFromRange method 
Write unit tests for getAnnotationsFromRange

Change-Id: I82ff15e97378c07e5c555a72231da4161a72993c
 2012-05-11 16:14:46 -07:00
Catrope 5b9a2645a6 Port getScope() from the old VE code and add tests for it 
Change-Id: I8c34fed919e60fa1b8cb6a13cb9ca98f3e695421
 2012-05-11 16:03:46 -07:00
Catrope 43c2393c03 Remove outdated comment 
Change-Id: I3a5db50aafa01d07bfb34359dfbe73812b3a7ab5
 2012-05-11 16:03:46 -07:00
Trevor Parscal db0e050b39 Renamed uses of "replacement" to "insert" 
Change-Id: I69ad0f84e8fefe1715339068b7685958f8f8546f
 2012-05-11 15:25:01 -07:00
Christian Williams 13f26682da Removing data from annotations when empty, more tests for HTMLConverter 
Change-Id: I3c3e234e9392e4afdcb4c8bc748aaa74a1fb30ca
 2012-05-11 14:07:20 -07:00
Trevor Parscal 9cdfb84f9b Added tests to getRelativeContentOffset 
Also fixed a typo in the implementation

Change-Id: I86855795009e34d42a3a5857addc5ccb6366130f
 2012-05-11 12:14:29 -07:00
Rob Moen 469a55bde4 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-11 10:31:12 -07:00
Rob Moen ced54d06a9 Write better test for DocumentFragment getAnnotationsFromOffset 
Fix errors in example test data
Remove whitespace

Change-Id: Ibb2b5c0851d6abac9974035753b95354b3c8dd5e
 2012-05-11 10:29:09 -07:00
Catrope ca17ea0943 Port structural replace code from the old VE code 
This makes TransactionProcessor work for regular replacements, as well
as insertions and deletions of self-contained pieces of data. This does
NOT yet work for inserting and deleting unbalanced data
(splitting/merging nodes).

I've tested this from the console for insertions and deletions and
simple replacements, but I haven't tested wrappings. We should write a
bunch of unit tests for this some time :)

Change-Id: Ic2fd75d1cf2e127bc9ae58debce67576be2c912f
 2012-05-10 20:20:42 -07:00
Catrope 3cc22b00cb Use index and indexFromNode (from selectNodes()) in DocumentSynchronizer 
This makes insertions work (using indexFromNode), and eliminates the
indexOf() call (using index)

Change-Id: Ibfa77353af99534edc324c0e314c8b95c5136d8b
 2012-05-10 20:20:42 -07:00
Catrope 6652f7573b Add indexInNode to selectNodes() output 
This is for the case where we have a zero-length range in between two
siblings, and we need to know what index that corresponds to in order to
be able to insert nodes there (rebuildNodes() will use it for this
purpose)

Change-Id: I357d1cd665667a76f955a10b8d9d2810976cdbd7
 2012-05-10 20:20:42 -07:00
Catrope 379bc8da3c selectNodes() fixes: 
* Initialize startOffset to 0 not 1, don't know what I was thinking
* Use currentFrame for nodeRange instead of parentFrame, don't know what
  I was thinking there either
* If the returned node has no parent (is the document node), don't
  attempt to access parentFrame and don't set index

Change-Id: Iad969a7c29436cdf4151ead7e9d3d8e2a30befb3
 2012-05-10 20:20:42 -07:00
Catrope 7eeb6c7cac Throw an exception when DocumentFragment gets unbalanced input 
Change-Id: Ie891bd7ea4d9e9b1c84e7a0390f1af39c0e55fd4
 2012-05-10 20:20:42 -07:00
Trevor Parscal 1475100a22 Ported isContentOffset, isStructuralOffset, isElementData, containsElementData and getRelativeContentOffset 
Tests for all but getRelativeContentOffset are done too

Change-Id: Iee953647ec89e13259ae2a402c50c809f93bc655
 2012-05-10 17:20:57 -07:00
Catrope 8834145f9e Fix nodeSelectionEqual() so it doesn't explode when a and b have unequal lengths 
Change-Id: Idb84bc1238576c711a201cdbf05f63a7b603a819
 2012-05-10 16:42:58 -07:00
Catrope 9b6402801a Fix the selectNodes() bug that Inez reported 
Selecting a zero-length range at the start or end of a text node
(e.g. (1,1)) would return the text node's parent instead of the text
node

Change-Id: I7fe089bf66b93185dd3415eff53aa7e04e3ffdb2
 2012-05-10 16:42:58 -07:00
Catrope f79e56b4f1 Document the stack properties used in selectNodes() 
Change-Id: Ibaf178830a0b7b99a4ab1c0ec09283bd3dd552e0
 2012-05-10 16:42:58 -07:00
Catrope ec449d168a Fix startOffset computation in selectNodes() 
* Needs to be initialized to 1, not 0
* Needs to be stored *after* left is incremented to account for an
  opening

Change-Id: I7978ae241578a8a17120e494684e6e93626a8529
 2012-05-10 16:42:58 -07:00
Catrope 38a9b8b301 Fix typo in selectNodes() 
Change-Id: I320728bafa289290c4c2a91fee736a8afb17be80
 2012-05-10 16:42:58 -07:00
Catrope 13b79d309c Add 'index' and 'nodeRange' to selectNodes() output 
Change-Id: I38712545b713cc24663ebec3fe3e5c8741b4fad7
 2012-05-10 15:03:23 -07:00
Trevor Parscal d4363c04f4 Don't set classes on non-wrapped elements 
* Text nodes do not have a wrapper to set classes on
* Use CSS class names that are equivalent to JS class names, swapping . with -

Change-Id: I49c877dd5c9b5dd2a9afad3137f12b14883043a1
 2012-05-10 14:54:33 -07:00
Inez Korczynski 3848e77c33 Basic support for Alien node in HTMLDom -> LinMod converter 
Change-Id: Ie9b08027c58694022a7b01609d25d720bfb35873
 2012-05-09 23:04:57 -07:00
Inez Korczynski 41a7451ea2 Store reference to view node (ve.ce.Node) in jQuery data of it's wrapper 
Change-Id: I84920b20346b4ef5e1203d834bf4c3fb9657ae69
 2012-05-09 22:43:46 -07:00
Inez Korczynski 1a4e488b06 Merge branch 'dmrewrite' of ssh://review/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-09 22:40:51 -07:00
Inez Korczynski ee39e837b8 Get Alien node (leaftnode) working - it reads its content from attribute 
'html'

Change-Id: Idd84da9af61369277df18fee577032de765b1205
 2012-05-09 22:36:25 -07:00
Trevor Parscal 1798a478e7 Massive refactor of node trees, generalizing lots of previously dm only stuff 
Change-Id: I9dbb7094f86338ea2e725ad29f66e9e4ca2b52ed
 2012-05-09 21:11:09 -07:00
Christian Williams 0848eaca04 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-09 18:36:05 -07:00
Christian Williams 3d289365bc Images and tables working with HTMLConverter 
Change-Id: I2e45eeddf031d00b006498f9b2fb4840a2f6df44
 2012-05-09 18:35:05 -07:00
Trevor Parscal 44b311920e Cleanup/refactor/documentation work for ve.dm.DocumentSynchronizer 
Change-Id: I5f70460e0d4496c91d92b83025fdf9ae1d9dece6
 2012-05-09 17:14:15 -07:00
Rob Moen d417c571a4 * Ported getAnnotationsFromOffset into DocumentFragment 
* Wrote unit test for getAnnotationsFromOffset

Change-Id: Ie88b15ac6c16838b2d2bf9a2d83ca2952f5df817
 2012-05-09 16:31:56 -07:00
Trevor Parscal a0178fd3bb Cleanup and renaming 
Change-Id: Ie0b742029f95e1475d58bb38b790bae3110259b0
 2012-05-09 15:27:18 -07:00
Catrope 17f4dc220a Don't use data.length in selectNodes() 
I was using data.length to check if the range was out of bounds, but
this is a problem when using selectNodes() inside of tree sync code
(which happens when performing rebuilds). While tree sync is in
progress, the model tree and the linear model don't match, so we
shouldn't be looking at the linear model for information about the model
tree. Instead, get the length of the DocumentNode and use that.
`

Change-Id: I11a378544ce1281a89cdcd4363c5cb1bf56f3434
 2012-05-08 18:31:51 -07:00
Catrope 00950f3a67 Add rebuild action to DocumentSynchronizer 
Change-Id: I379ceef3829026c4b4157e59243b7663b6c7ab2f
 2012-05-08 18:31:51 -07:00
Catrope 94697a3241 Emit an 'update' event in addition to an 'annotation' event 
Change-Id: Idab673bce4fa4b10816d753020adae40598c8b7a
 2012-05-08 18:31:51 -07:00
Catrope 09631f1466 Make TransactionProcessor actually use DocumentSynchronizer 
Change-Id: If0ac69026fa34430d811de5f7ca0748d9b1e01cc
 2012-05-08 18:31:51 -07:00
Catrope 22c88f77c3 Add a 'siblings' mode to selectNodes(), and add tests for it 
Change-Id: Ib3fd3ee5aba7aab7c26193a2a9c48612f624862a
 2012-05-08 18:31:50 -07:00
Trevor Parscal d061b62a72 Added some documentation to ve.dm.DocumentSynchronizer constructor 
Change-Id: Ib24f0101e60b34af292d46d3ea866859a89a18f5
 2012-05-07 19:43:34 -07:00
Trevor Parscal d43ee569ac Cleanup of HTMLConverter 
Change-Id: I145bfbbb8b759ea33eef291b53daf935e97ac341
 2012-05-07 19:43:03 -07:00
Trevor Parscal 123c64cbd5 Added more tests for selectNodes 
Change-Id: Ibd9672fb9b6ce682905d20f9346fada6fb47b380
 2012-05-07 19:03:59 -07:00
Catrope 4d9299b808 Fix bugs in selectNodes(), tests pass now 
Also fix one instance of bad expected data in a selectNodes test

Change-Id: Ie226b237cf537143bce2f6b1e531b9067b140cb4
 2012-05-07 17:03:42 -07:00
Catrope 32c65cdaa8 Change 'leaf' to 'leaves' and document it 
Change-Id: I09d5995d3d9bf82670802f0efe849f40be2a18a3
 2012-05-07 17:03:42 -07:00
Trevor Parscal f4fcf9663e Added documentation and tests for ve.dm.Document.selectNodes 
Also:
* Broke node lookup method out into ve.dm.example.lookupNode
* Added ve.dm.example.nodeSelectionEqual

Change-Id: I437cdd3f3154d10782f03f78df6d5c457ecfc845
 2012-05-07 15:15:21 -07:00
Inez Korczynski 82ef058cb7 Add two more cats to demo/example article 
Change-Id: I25757965ffdfceed2c85c9d76ce58af3d23716f2
 2012-05-07 14:30:05 -07:00
Catrope ad5ee8f822 First implementation of selectNodes() 
Currently only implements mode=='leaves', i.e. traverse all leaf nodes.
Seems to work from casual testing, but is missing unit tests. See also
other TODO comments in this commit

Change-Id: I41292c21c627a18af7985e8ef9e23c7b14252b21
 2012-05-07 13:57:58 -07:00
Catrope 93d6adb5f2 Add an isWrapped property and make getOuterLength use it 
This gets rid of the length == outerLength-2 hack in getDataFromNode()
and will make it easier to implement similar logic in selectNodes()

Change-Id: I1294350b67ca3eefde2b7fe9fea0bc6d8b90f772
 2012-05-07 12:00:07 -07:00
Christian Williams 1ef380984f Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-04 20:44:10 -07:00
Christian Williams 6e7588a33b Support for new annotation format 
Change-Id: Ib873981792d2cb4d78a3e4805287c48b3de78558
 2012-05-04 20:22:05 -07:00
Trevor Parscal e34ec4b479 Added canHaveChildren and canHaveGrandchildren to all nodes 
Change-Id: Ibe53292f7269736750e03da49e5bb5913c0124ab
 2012-05-04 17:50:54 -07:00
Trevor Parscal 1d74945dfc Fixes for Roan's crazy half-baked commit 
Change-Id: Ic104debc3a941e4cf8e4dca19633dcad04a0fe0a
 2012-05-04 16:13:54 -07:00
Christian Williams 28eb0c82e5 Adding HTML DOM -> Linear Model converter 
Change-Id: Iae109d75e64321a7fe4ee8492d79ef5481716246
 2012-05-04 15:47:41 -07:00
Catrope d11af2b687 Queue and deduplicate events in DocumentSynchronizer 
Change-Id: I90577cd078c3d0b6706f5f827b66b46a450e7086
 2012-05-04 15:42:35 -07:00
Rob Moen d42e738636 - Optimize surface model and write unit tests 
Change-Id: I8de24c840c5aa2d4232e6e2cc5f72cbd30be96b4
 2012-05-04 15:29:47 -07:00
Inez Korczynski 0562d83f2f Merge branch 'dmrewrite' of ssh://review/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-04 15:20:47 -07:00
Inez Korczynski bab1a9672c Fix method getDocument in dm.Surface and start using it 
Change-Id: I613b1e938cd0d8f3a6ac8a48121901287c8fc5af
 2012-05-04 15:20:14 -07:00
Catrope 2baeb5532d Initial stab at DocumentSynchronizer 
Change-Id: I7176fd7235a82a6314bf431d00870d9ddb40f370
 2012-05-04 15:18:07 -07:00
Trevor Parscal dc27d8acb4 Refactored dom wrapper functionality in ce nodes 
* Moved implementation of getting and updating a DOM wrapper to ve.ce.BranchNode
* Updated ve.ce.BranchNode tests
* Renamed ve.NodeFactory.createNode to ve.NodeFactory.create
* Added  ve.NodeFactory.lookup which gets the constructor of a type
* Added attribute pass-through to ve.dm.BranchNodeStub

Change-Id: I8f5b7d3d3ae616cc5f39828b24b655163d782ae5
 2012-05-04 13:31:14 -07:00
Trevor Parscal d2480baed0 Removed bubbling update events in dm and ce node trees and splice events from ce branches 
The bubbling update events are not needed with ce or dm, but were once upon a time useful for es, this just eliminates some unused cruft that was costing extra function call overhead.

Change-Id: Ia16d0f4cd74c84cded5caecada33ee83d0882f30
 2012-05-04 12:28:32 -07:00
Trevor Parscal 9887dbd96f Split Broke DefinitionListNode out of ListNode and DefinitionListItemNode out of ListItemNode 
* Makes it simpler in the linear model because we don't have to use style: "item" for regular list items and style: "definition" for definition lists
* Enforces correct nesting through existing node rules systems
* Updates tests accordingly

Change-Id: I64d80af938e325f1961226505bdc386bb35ccdda
 2012-05-04 11:56:32 -07:00
Catrope 11a3b6886b Implement basic replace processor 
* Implement basic TransactionProcessor.replace(), only does content
  replacements
* Add ve.dm.Document.containsElementData()
* Fix bug in attribute()
* Write basic tests for attribute() and replace()

Change-Id: Ie9c22aec3f2631be5b0bd66790408ad283565491
 2012-05-04 11:09:10 -07:00
Trevor Parscal a9b26c8b55 Removed recursive rendering calls in favor of 100% event driven updates 
Change-Id: I636222518e4cbeddb1c02901b79a9dcb09eeb952
 2012-05-03 17:19:01 -07:00
Rob Moen 0cd31fba2e rename surfaceModel to model in ce.Surface 
Change-Id: I5d49915b4645464729ab1e4552982cbd38f712b1
 2012-05-03 16:14:54 -07:00
Rob Moen bead2050b9 Merge branch 'dmrewrite' of ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-03 16:04:47 -07:00
Rob Moen da65ad48c8 - extend surface model and surface view with event emitter 
- added surface view base methods
- enabled toolbar in ve.Surface

Change-Id: Ib6a62ef2509712f812f262283c45bb30c8f97ef1
 2012-05-03 16:02:21 -07:00
Christian Williams 99e841d31a Making document contenteditable 
Change-Id: If79bb8c69431e07de2a42cc5b565b3093c29c4cd
 2012-05-03 15:42:02 -07:00
Inez Korczynski d01d27cc09 Get more tags/nodes working in the demo 
Change-Id: I5335fbbe15d010a73a06f24bc56ebb3c3c6bd2d7
 2012-05-03 15:00:34 -07:00
Inez Korczynski 6224c60075 Rendering works in very basic version 
Change-Id: I8789860fe82f2e7db1e503889e20ce51de57bfa2
 2012-05-03 14:02:35 -07:00
Inez Korczynski 06ca808b65 Missing keyword: new 
Change-Id: Id65d30d702e991620e0d454fa000c438f4738b41
 2012-05-03 13:32:23 -07:00
Rob Moen 7bcb65e036 - Port surface constructor into dmrewrite. 
- Create document model object linear model instead of wikidom

Change-Id: I16307c290ead3e4b29dfbd1b76759e4c19c3fc8b
 2012-05-03 13:23:21 -07:00
Trevor Parscal 7b7ff5a503 Added ve.dm.Surface, ve.ce.Surface, ve.ce.Document 
Change-Id: I382730e1a9f1abcb4b42499267c8dcaf76fc64e1
 2012-05-03 13:21:13 -07:00
Trevor Parscal b1b9fb5133 Added tests for getDataFromNode 
Change-Id: Ic762832dcdda3bdaf92dbd989659235fdff73596
 2012-05-03 13:11:36 -07:00
Inez Korczynski 619f10108c Minor fixes to getHtml method in TextNode 
Change-Id: I53c873b6e307d53cc87c2e111ab99f694972b17b
 2012-05-03 11:11:46 -07:00
Inez Korczynski a1db1537ad Minor fixes to getHtml method in TextNode 
Change-Id: I4d0b1a0295071ead413d68945310d3a4ef6fe7e4
 2012-05-03 10:11:39 -07:00
Inez Korczynski 09c7393901 Minot fix 
Change-Id: If10f9135f9bf33af17be6f8a2db59433d9898944
 2012-05-02 22:32:34 -07:00
Inez Korczynski a3b32b6615 Big refactoring to TextNode to make it work with new format of storing 
annotations.

Change-Id: If84fcfdd04ff42e9b2449e1c8186d64fec4fb1ac
 2012-05-02 22:28:57 -07:00
Inez Korczynski 9f11f437d2 Merge branch 'dmrewrite' of ssh://review/mediawiki/extensions/VisualEditor into dmrewrite 2012-05-02 19:29:49 -07:00
Inez Korczynski d81b972cdf Very dirty but working version of getHtml method for TextNode (with bunch 
of tests that are passing now).

Change-Id: Ie76bd59bc0a5e10e2a3b3e014b2d0e4701fcc368
 2012-05-02 19:29:03 -07:00
Trevor Parscal 64d56971a9 Removing unused code 
Change-Id: I23213531eeef95110d0a3d1e2476449c580b55b7
 2012-05-02 17:05:22 -07:00
Trevor Parscal b7b2fc1179 Made render for ce leaf nodes abstract and added a test for it 
Change-Id: Iee228d5f1a18a5c9618680fa81ab132a85472fa6
 2012-05-02 15:59:43 -07:00
Trevor Parscal 947c3ddf22 Fixed incorrect class name for method typo 
Change-Id: I82390896ef7136bfc8ed8734d8bd9014e756af5e
 2012-05-02 15:59:15 -07:00
Trevor Parscal d412c8c159 Removed unused method (using factory instead) 
Change-Id: I0ed9260d261b7e4c19e5d57f70331aef1a341cdf
 2012-05-02 15:58:40 -07:00