Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Change license to MIT -close #1

  • Loading branch information...
commit 14abbbdf72b6d085c8b0fcbcda72e23100f4aa15 1 parent c491609
@Xiphe authored
View
359 LICENSE
@@ -1,339 +1,20 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+The MIT License
+
+Copyright (C) 2014 Hannes Diercks
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
31 jquery.phpdiffmerge.js
@@ -1,30 +1,13 @@
/**
* jQuery Merge for php-diff v0.2.2
- *
+ * https://github.com/Xiphe/jQuery-Merge-for-php-diff
+ *
* A jQuery plugin for handling the conflicts between two documents.
* Requires [php-diff](https://github.com/chrisboulton/php-diff) on the server side.
- *
- * https://github.com/Xiphe/jQuery-Merge-for-php-diff
- * Distributed under GNU General Public License.
+ *
+ * Copyright 2014, Hannes Diercks <github@xiphe.net>
+ * Released under the MIT license
*/
-
-/*
- Copyright (C) 2013 Hannes Diercks
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
/*global console */
(function($){
"use strict";
@@ -396,7 +379,7 @@
},
_setLine: function() {
- /*
+ /*
* Get the first line of the conflict from the previous table
* because there was a bug with the line numbers in php-diff.
*/
@@ -466,7 +449,7 @@
// ======================= Plugin bridge ===============================
// From jquery.isotope.js
// https://github.com/desandro/isotope/blob/master/jquery.isotope.js#L1363
- //
+ //
// A bit from jQuery UI
// https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.widget.js
// A bit from jcarousel
View
9 jquery.phpdiffmerge.min.js
@@ -1,10 +1,11 @@
/**
* jQuery Merge for php-diff v0.2.2
- *
+ * https://github.com/Xiphe/jQuery-Merge-for-php-diff
+ *
* A jQuery plugin for handling the conflicts between two documents.
* Requires [php-diff](https://github.com/chrisboulton/php-diff) on the server side.
- *
- * https://github.com/Xiphe/jQuery-Merge-for-php-diff
- * Distributed under GNU General Public License.
+ *
+ * Copyright 2014, Hannes Diercks <github@xiphe.net>
+ * Released under the MIT license
*/
(function(b){function j(a,d){this._id=1+m++;this.$el=b(a);this.options=b.extend({},k,d);this._defaults=k;this._name=e;this._init()}function l(a,d){this.$el=b(a);this.master=d;this._init()}function f(a,b){var c=window.open("popup.html");b=b.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;");c.document.write("<html><head><title>"+a+"</title></head><body><pre>"+b+"</pre></body></html>")}var e="phpdiffmerge",k={left:"",right:"",debug:!1,pupupResult:!1,pupupSources:!1, merged:function(){}},m=0;j.prototype={$conflicts:b(),conflicts:[],toResolve:0,toMerge:0,inline:!1,result:"",lineOffset:0,_tmpLineOffset:0,_init:function(){var a=this;a._debug("PHPDiffMerge about to be initiated with options:",a.options);a.$conflicts=a.$el.find(".ChangeReplace, .ChangeDelete, .ChangeInsert");a.toResolve=a.$conflicts.length;if(0>=a.toResolve||""===a.options.left&&""===a.options.right)return a._debug("Nothing to merge or merge sources not available - Please submit left and right on plug-in initiation!"), !1;this.inline=a.$el.hasClass("DifferencesInline");a._ensurePresenceOfMergeButton();b.each(a.$conflicts,function(){a.conflicts.push(new l(this,a))});a.$conflicts.on("xiphe_phpdiffmerge_resolved",b.proxy(a._conflictResolved,a));a.$conflicts.on("xiphe_phpdiffmerge_merged",b.proxy(a._conflictMerged,a));a.$conflicts.on("xiphe_phpdiffmerge_merged",b.proxy(a._updateLineOffset,a));a._debug("PHPDiffMerge initiated",a)},useRight:function(){this.$conflicts.find("td.Right").click();this.$el.hasClass("DifferencesInline")&& this.$el.find(".ChangeDelete td.Left").click().click()},useLeft:function(){this.$conflicts.find("td.Left").click();this.$el.hasClass("DifferencesInline")&&this.$el.find(".ChangeInsert td.Right").click().click()},merge:function(a){"undefined"!==typeof a&&null!==a&&a.preventDefault();if("disabled"===this.options.button.attr("disabled"))this._debug("Unable to merge: not all conflicts have been resolved.");else{this.result=this.options.left.slice(0);this.lineOffset=0;this.toMerge=this.$conflicts.length; for(a=0;a<this.conflicts.length;a++)this.conflicts[a].merge()}},option:function(a){b.isPlainObject(a)&&(this.options=b.extend(!0,this.options,a))},_ensurePresenceOfMergeButton:function(){"undefined"===typeof this.options.button||!b(this.options.button).length?(this.options.button=b("<button />").html("Merge").attr("disabled","disabled").css({display:"block",height:"50px",width:"200px",margin:"50px auto"}),this.$el.after(this.options.button)):this.options.button=b(this.options.button).attr("disabled", "disabled");this.options.button.click(b.proxy(this.merge,this))},_debug:function(){this.options.debug&&(window.console&&console.log)&&console.log(Array.prototype.slice.call(arguments))},_conflictResolved:function(){this.toResolve--;0===this.toResolve&&this.options.button.removeAttr("disabled")},_conflictMerged:function(){this.toMerge--;0===this.toMerge&&(this.options.pupupResult&&f("end",this.result.join("\n")),this.options.pupupSources&&(f("left",this.options.left.join("\n")),f("right",this.options.right.join("\n"))), "function"===typeof this.options.merged&&this.options.merged.call(this,this.result,this.options.left,this.options.right))},_deleteResult:function(a,d){this._debug("Deleting Left: "+a+" - "+(a+d-1)+".");var c=this.result.splice(a+this.lineOffset-1,d);this.options.debug&&(c=c.map(function(a){return b.trim(a).substring(0,10)+"..."}),this._debug("Content: ",c));this._tmpLineOffset-=d},_insertResult:function(a,d,c){for(var e=[],g=0;g<d;g++){var f=this.options.right[a-1+g];e.push(f);this.result.splice(c- 1+this.lineOffset+g,0,f)}this.options.debug&&(this._debug("Left line prior to insertion: "+(c-1)),this._debug("Content: ",b.trim(this.result[c-2+this.lineOffset]).substring(0,10)),this._debug("Inserted Right: Row "+a+" - "+(a+d-1)+"."),e=e.map(function(a){return b.trim(a).substring(0,10)+"..."}),this._debug("Content: ("+e.join(", ")+")"));this._tmpLineOffset+=d},_updateLineOffset:function(){this._debug("Change lineOffset from: "+this.lineOffset+" to "+(this.lineOffset+this._tmpLineOffset)+".");this.lineOffset+= this._tmpLineOffset;this._tmpLineOffset=0}};l.prototype={_resolved:!1,type:"",useLeft:!1,leftLine:0,rightLine:0,rowsLeft:0,rowsRight:0,_init:function(){this.type=this.$el.attr("class").match(/Change([\w]+)/)[1];this.$el.find("td").click(b.proxy(this._clicked,this)).hover(b.proxy(this._hoverIn,this),b.proxy(this._hoverOut,this));this._setLine();this._setRows();this.master._debug("Conflict initiated:",this)},merge:function(){if(this.useLeft)this.master._debug("Ignoring lines "+this.leftLine+" - "+(this.leftLine+ this.rowsLeft-1)+".");else switch(this.master._debug("Merging Conflict:",this),this.type){case "Replace":this._delete();this._insert();break;case "Insert":this._insert();break;case "Delete":this._delete();break;default:h('Undefined merge method "'+this.type+'".');return}this.$el.trigger("xiphe_phpdiffmerge_merged")},_hoverIn:function(a){a=b(a.delegateTarget).hasClass("Left")?"Left":"Right";this.$el.find("td."+a).addClass("hover")},_hoverOut:function(){this.$el.find("td.hover").removeClass("hover")}, _clicked:function(a){a=b(a.delegateTarget);var d;this.master.inline?(this.useLeft=a.hasClass("use"),a.hasClass("Left")&&(this.useLeft=!this.useLeft)):this.useLeft=a.hasClass("Left");a=this.useLeft?"Left":"Right";d=this.useLeft?"Right":"Left";this.master.inline&&("Delete"===this.type||"Insert"===this.type)?(a=this.$el.find("td"),a.toggleClass("use"),a.toggleClass("dontUse",!a.hasClass("use"))):(this.$el.find("td."+a).removeClass("dontUse").addClass("use"),this.$el.find("td."+d).removeClass("use").addClass("dontUse")); this._resolved||(this._resolved=!0,this.$el.trigger("xiphe_phpdiffmerge_resolved"))},_setLine:function(){var a=this.$el.prev("tbody").find("tr").last();this.leftLine=parseInt(a.find("th").first().html()||0,10)+1;this.rightLine=parseInt(a.find("th").last().html()||0,10)+1},_setRows:function(){var a=this;a.master.inline?(a.rowsLeft=a.$el.find(".Left").length,a.rowsRight=a.$el.find(".Right").length):(a.rowsLeft=0,a.$el.find(".Left").each(function(){"&nbsp;"!==b(this).prev("th").html()&&a.rowsLeft++}), a.rowsRight=0,a.$el.find(".Right").each(function(){"&nbsp;"!==b(this).prev("th").html()&&a.rowsRight++}))},_insert:function(){this.master._insertResult(this.rightLine,this.rowsRight,this.leftLine)},_delete:function(){this.master._deleteResult(this.leftLine,this.rowsLeft)}};var h=function(a){window.console&&window.console.error(a)};b.fn[e]=function(a){if("string"===typeof a){var d=Array.prototype.slice.call(arguments,1);this.each(function(){var c=b.data(this,"plugin_"+e);c?!b.isFunction(c[a])||"_"=== a.charAt(0)?h("no such method '"+a+"' for "+e+" instance"):c[a].apply(c,d):h("cannot call methods on "+e+" prior to initialization; attempted to call method '"+a+"'")})}else this.each(function(){var c=b.data(this,"plugin_"+e);c?(c.option(a),c._init()):b.data(this,"plugin_"+e,new j(this,a))});return this}})(jQuery);
View
16 readme.md
@@ -171,18 +171,4 @@ Todo
License
-------
-Copyright (C) 2012 Hannes Diercks
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+[MIT](https://raw.github.com/Xiphe/jQuery-Merge-for-php-diff/master/LICENSE)
Please sign in to comment.
Something went wrong with that request. Please try again.