Merge pull request #3 from blackice2999/7.x

7.x

js/tagging.init.js

@@ -12,4 +12,10 @@
     obj.attach();
     return obj;
   };
+
+  Drupal.behaviors.tagging_d7 = {
+    attach: function(context, settings) {
+      $('input.tagging-widget-input:not(.tagging-processed)').tagging();
+    }
+  };
 })(jQuery);

modules/drupalwiki_tagging_suggest/drupalwiki_tagging_suggest.info

@@ -3,7 +3,7 @@
 name = Drupal Wiki tagging suggestions
 description = Suggesting terms for the Tagging-Module based on the current content and a algorythm developed for Drupal Wiki
 package = Tagging
-core = 6.x
+core = 7.x
 dependencies[] = taxonomy
 dependencies[] = tagging
 files[] = drupalwiki_extractor.inc

modules/tagging_opencalais_suggest/tagging_opencalais_suggest.info

@@ -1,26 +1,7 @@
 name = Tagging opencalais suggestions
 description = This tagging module exposes suggestions based on the current content (body) using the semantic opencalais service
 package = "Taxonomy"
-core = 6.x
+core = 7.x
 dependencies[] = taxonomy
 dependencies[] = tagging
 dependencies[] = calais_api
-; Information added by drupal.org packaging script on 2009-12-04
-version = "6.x-2.0"
-core = "6.x"
-project = "tagging_opencalais_suggest"
-datestamp = "1259920274"
-
-; Information added by drupal.org packaging script on 2010-03-18
-version = "6.x-2.1"
-core = "6.x"
-project = "tagging"
-datestamp = "1268902508"
-
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-

modules/tagging_vocab_suggest/tagging_vocab_suggest.info

@@ -1,14 +1,7 @@
 name = Tagging full-vocabular suggestion
 description = This tagging module exposes all vocabulary terms of a the vocabulary as suggestions (no matter what is in the content).
 package = "Taxonomy"
-core = 6.x
+core = 7.x
 dependencies[] = taxonomy
 dependencies[] = tagging
 
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-

modules/tagging_vocab_suggest/tagging_vocab_suggest.module

@@ -7,7 +7,13 @@ function tagging_vocab_suggest_tagging_suggestions($vid, $node) {
   $suggestions = array();
 
   if(strpos(VERSION, '7') === 0) {
-    $result  = db_query('select * from {taxonomy_term_data} where vid=:vid', array(':vid' => $vid));
+    $query = db_select('taxonomy_term_data', 't');
+    $query->fields('t');
+    $query->condition('vid', $vid);
+    $query->addTag('translatable');
+    $query->addTag('term_access');
+    $result = $query->execute();
+
     foreach($result as $term) {
       $suggestions[] = array('#weight' => $term->weight, '#name' => $term->name);
     }

tagging.info

@@ -1,14 +1,6 @@
 name = Tagging
 description = This widget is replacing the default Drupal-Tagging-Interface with a more visual driven one, to make tagging even easier. (by <a href="http://kontextwork.de"KontextWork</a>)
 package = "Drupal Wiki"
-version = "6.x-2.4"
-core = 6.x
+core = 7.x
 dependencies[] = taxonomy
 project = "tagging"
-
-; Information added by drupal.org packaging script on 2010-10-17
-version = "6.x-2.5"
-core = "6.x"
-project = "tagging"
-datestamp = "1287311492"
-

tagging_d7.class.inc

@@ -55,7 +55,6 @@ class tagging_d7 extends tagging_d6 {
 
   public function  _tagging_widget_javascript($form_element = null, &$form_state = array()) {
     $form_element = parent::_tagging_widget_javascript($form_element, $form_state);
-    drupal_add_js('jQuery(document).ready(function () {Drupal.behaviors.tagging_d7 = Drupal.behaviors.tagging_d6();});', array('type' => 'inline', 'scope' => 'footer'));
     return $form_element;
   }
 }