summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Ferran (aka Markus)2009-06-07 00:31:35 (GMT)
committer Marc Ferran (aka Markus)2009-06-07 00:31:35 (GMT)
commit5fdfe62712d2f562d9bff04db7a7fb155977a135 (patch)
treeb2de5abcbb9ffaaf305dc2a9010b3106a45a5e11
parentc47f7507bb3fdc2041e2fa0cc6831c6638333129 (diff)
- #421116 Move content.js to js/content.admin.js for consistency with location of new js files.
-rw-r--r--CHANGELOG.txt3
-rw-r--r--js/content.admin.js (renamed from content.js)0
-rw-r--r--theme/theme.inc2
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 95b9a22..ce262d0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,9 @@ CCK 6.x-3.x
Bugfixes:
- #482774 Update breaks when CCK is disabled.
+Other changes:
+- #421116 Move content.js to js/content.admin.js for consistency with location of new js files.
+
Features:
- #196421 by markus_petrux: Deleting unwanted multiple values / multiple values delta issues.
- #119102 by markus_petrux: Combo field - group different fields into one.
diff --git a/content.js b/js/content.admin.js
index 72a2f2a..72a2f2a 100644
--- a/content.js
+++ b/js/content.admin.js
diff --git a/theme/theme.inc b/theme/theme.inc
index 517a25f..787e25f 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -94,7 +94,7 @@ function template_preprocess_content_field_overview_form(&$vars) {
$js_fields[$field_name] = array('label' => $field['widget']['label'], 'type' => $field['type'], 'widget' => $field['widget']['type']);
}
drupal_add_js(array('contentWidgetTypes' => content_widget_type_options(), 'contentFields' => $js_fields), 'setting');
- drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
+ drupal_add_js(drupal_get_path('module', 'content') .'/js/content.admin.js');
}
/**