| Index: trunk/parsers/wikidom/lib/es/es.Surface.js |
| — | — | @@ -627,21 +627,12 @@ |
| 628 | 628 | * @param selection {Selection} Range to apply annotation to |
| 629 | 629 | */ |
| 630 | 630 | Surface.prototype.annotateContent = function( method, annotation, selection ) { |
| 631 | | -<<<<<<< .mine |
| 632 | 631 | if ( typeof selection === 'undefined' ) { |
| 633 | 632 | selection = this.selection; |
| 634 | 633 | } |
| 635 | 634 | if ( !selection.from || !selection.to ) { |
| 636 | | -======= |
| 637 | | - if ( selection === undefined ) { |
| 638 | | - selection = this.selection; |
| 639 | | - } |
| 640 | | - /* |
| 641 | | - if ( !selection.from && !selection.to ) { |
| 642 | | ->>>>>>> .r92506 |
| 643 | 635 | throw 'Invalid selection error. Properties for from and to locations expected.'; |
| 644 | 636 | } |
| 645 | | - */ |
| 646 | 637 | selection.normalize(); |
| 647 | 638 | var from = selection.start, |
| 648 | 639 | to = selection.end; |