Thomas Bruederli
2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6
Fix merge error that disabled contact drag'n'drop
1 files modified
6 ■■■■ changed files
program/js/app.js 6 ●●●● patch | view | raw | blame | history
program/js/app.js
@@ -4319,6 +4319,9 @@
          writable = writable || (!source.readonly && !contact.readonly);
      }
      if (contact._type != 'group')
        list.draggable = true;
      this.env.selection_sources = $.unique(this.env.selection_sources);
    }
@@ -5054,9 +5057,6 @@
          if (++colprop.count == colprop.limit && colprop.limit)
            $(menu).children('option[value="'+col+'"]').prop('disabled', true);
        }
        if (contact._type != 'group')
          list.draggable = true;
      }
    }
  };