Permalink
Browse files

Release v0.3.2

  • Loading branch information...
1 parent 875ff64 commit bfbd19e0d243d8ef70189b65f3152b335d2c253d @Xiphe committed May 13, 2014
View
@@ -1,6 +1,6 @@
{
"name": "jQuery-Merge-for-php-diff",
- "version": "0.3.1",
+ "version": "0.3.2",
"homepage": "https://github.com/Xiphe/jQuery-Merge-for-php-diff",
"authors": [
"Hannes Diercks <github@xiphe.net>"
@@ -1,6 +1,6 @@
/*!
* jQuery-Merge-for-php-diff - A jQuery plugin for handling the conflicts between two documents.
-* v0.3.1 - 2014-04-20 4:09:27 PM UTC
+* v0.3.2 - 2014-05-13 3:53:31 PM UTC
* Copyright (c) 2014 Hannes Diercks <github@xiphe.net>; License: MIT
*/
.Differences .ChangeReplace td,
@@ -1,6 +1,6 @@
/*!
* jQuery-Merge-for-php-diff - A jQuery plugin for handling the conflicts between two documents.
-* v0.3.1 - 2014-04-20 4:09:27 PM UTC
+* v0.3.2 - 2014-05-13 3:53:31 PM UTC
* Copyright (c) 2014 Hannes Diercks <github@xiphe.net>; License: MIT
*/
(function($) {
@@ -499,7 +499,7 @@
var args = Array.prototype.slice.call(arguments, 1);
self.each(function() {
- var instance = $.data(self, 'plugin_' + pluginName);
+ var instance = $.data(this, 'plugin_' + pluginName);
if (!instance) {
logError('cannot call methods on ' + pluginName + ' prior to initialization; ' +
'attempted to call method "' + options + '"');

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1,7 +1,7 @@
{
"name": "jQuery-Merge-for-php-diff",
"compactname": "jquery.phpdiffmerge",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "A jQuery plugin for handling the conflicts between two documents.",
"main": "jquery.phpdiffmerge.js",
"directories": {

0 comments on commit bfbd19e

Please sign in to comment.