Merge branch 'master' into stable

Conflicts:
	doku.php

1 files changed, 0 insertions, 46 deletions

diff --git a/lib/scripts/subscriptions.js b/lib/scripts/subscriptions.js
deleted file mode 100644
index d701f258f..000000000
--- a/lib/scripts/subscriptions.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Hide list subscription style if target is a page
- *
- * @author Adrian Lang <lang@cosmocode.de>
- */
-
-addInitEvent(function () {
-    var form = $('subscribe__form');
-    if (!form) {
-        return;
-    }
-
-    var styleradios = {};
-
-    function update_state() {
-        if (!this.checked) {
-            return;
-        }
-        if (this.value.match(/:$/)) {
-            styleradios.list.parentNode.style.display = '';
-        } else {
-            styleradios.list.parentNode.style.display = 'none';
-            if (styleradios.list.checked) {
-                styleradios.digest.checked = 'checked';
-            }
-        }
-    }
-
-    var cur_sel = null;
-
-    var inputs = form.getElementsByTagName('input');
-    for (var i = 0; i < inputs.length ; ++i) {
-        switch (inputs[i].name) {
-        case 'sub_target':
-            addEvent(inputs[i], 'click', update_state);
-            if (inputs[i].checked) {
-                cur_sel = inputs[i];
-            }
-            break;
-        case 'sub_style':
-            styleradios[inputs[i].value] = inputs[i];
-            break;
-        }
-    }
-    update_state.call(cur_sel);
-});