diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-24 21:59:56 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-24 21:59:56 +0200 |
| commit | f17eea506afaab0c0755d0fefe3a3f62eeb38e9d (patch) | |
| tree | b5c1f8a33aef46f1a718d5313bef8f4e52700acf /apps/files_versioning/js/settings.js | |
| parent | d6346b5b0bece4feecc36b7b97308dd3a5a4d6cc (diff) | |
| parent | 9b134b063683aca678e19912ebc3928321751714 (diff) | |
| download | nextcloud-server-f17eea506afaab0c0755d0fefe3a3f62eeb38e9d.tar.gz nextcloud-server-f17eea506afaab0c0755d0fefe3a3f62eeb38e9d.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files_versioning/js/settings.js')
| -rw-r--r-- | apps/files_versioning/js/settings.js | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/apps/files_versioning/js/settings.js b/apps/files_versioning/js/settings.js deleted file mode 100644 index 8dd13bac033..00000000000 --- a/apps/files_versioning/js/settings.js +++ /dev/null @@ -1,25 +0,0 @@ -$(document).ready(function(){ - $('#file_versioning_head').chosen(); - - $.getJSON(OC.filePath('files_versioning', 'ajax', 'gethead.php'), function(jsondata, status) { - - if (jsondata.head == 'HEAD') { - // Most recent commit, do nothing - } else { - $("#file_versioning_head").val(jsondata.head); - // Trigger the chosen update call - // See http://harvesthq.github.com/chosen/ - $("#file_versioning_head").trigger("liszt:updated"); - } - }); - - $('#file_versioning_head').change(function() { - - var data = $(this).serialize(); - $.post( OC.filePath('files_versioning', 'ajax', 'sethead.php'), data, function(data){ - if(data == 'error'){ - console.log('Saving new HEAD failed'); - } - }); - }); -}); |