Permalink
Browse files

Enhanced settings.

  • Loading branch information...
1 parent c5f5677 commit b29210a0562da8be32762c63476b01442cf7309c zensations committed Jan 16, 2012
Showing with 9 additions and 9 deletions.
  1. +2 −2 coffee/toolbar-drupdown.coffee
  2. +2 −1 drupdown.module
  3. +5 −6 js/toolbar-drupdown.js
@@ -184,10 +184,10 @@ define 'ace/toolbar/drupdown', ['require', 'exports', 'module'], (require, expor
$('.drupdown-float-options .column', dialog).click ->
$('input', this).attr('checked', 'checked')
files = []
- formats = Drupal.settings.drupdown.styles[@field_name][@format]
+ formats = Drupal.settings.drupdown.styles[@format]
for file in ($(file).val() for file in $('.drupdown-resource'))
if file.match /^original:\/\//
- for style in formats
+ $.each formats, (style) ->
files.push file.replace /^original:\/\//, style + '://'
else
files.push file
View
@@ -250,11 +250,12 @@ function drupdown_text_format_process($element) {
$style_settings = array();
foreach ($formats as $format_id) {
$filters = filter_list_format($format_id);
+ $style_settings[$format_id] = array();
foreach ($filters as $filter) {
if ($filter->name == 'filter_drupdown') {
foreach ($filter->settings['styles'] as $style) {
if ($style) {
- $style_settings[$element['#field_name']][$format_id][] = $style;
+ $style_settings[$format_id][$style] = $style;
}
}
}
View

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

Oops, something went wrong.

0 comments on commit b29210a

Please sign in to comment.