Merge branch 'develop' of github.com:OS2web/os2web_cp_service into develop

Author: andersbryrup

os2web_cp_service.make

@@ -18,14 +18,14 @@ core = 7.x
 
 ; Features + related
 # projects[features][subdir] = "contrib"
-# projects[features][version] = "2.0-beta1"
+# projects[features][version] = "2.0-beta2"
 
 # projects[strongarm][subdir] = "contrib"
 # projects[strongarm][version] = "2.0"
 
 ;Views
 # projects[views][subdir] = "contrib"
-# projects[views][version] = "3.5"
+# projects[views][version] = "3.7"
 # projects[views][patch][] = "http://drupal.org/files/combine_and_contains_word-1782678-9.patch"
 
 # projects[views_php][subdir] = "contrib"
@@ -40,7 +40,7 @@ core = 7.x
 
 ; Basic
 # projects[ctools][subdir] = "contrib"
-# projects[ctools][version] = "1.2"
+# projects[ctools][version] = "1.3"
 
 # projects[date][subdir] = "contrib"
 # projects[date][version] = "2.6"
@@ -58,4 +58,4 @@ core = 7.x
 # projects[token][version] = "1.4"
 
 # projects[entity][subdir] = "contrib"
-# projects[entity][version] = "1.0-rc3"
+# projects[entity][version] = "1.1"

os2web_cp_service.module

@@ -11,11 +11,19 @@ include_once 'os2web_cp_service.features.inc';
  * Implements hook_init().
  */
 function os2web_cp_service_init() {
-  // [email protected]
-  // Menu Minipanels us using qTip. Only add qTip js if module doesnt exits.
-  if (!module_exists('menu_minipanels')) {
-    drupal_add_js(drupal_get_path('module', 'os2web_cp_service') . '/js/jquery.qtip-1.0.0-rc3.min.js');
+
+  // Proper Libraries API support.
+  $qtip_path = NULL;
+  if (function_exists('libraries_get_path')) {
+    $qtip_path = libraries_get_path('qtip');
+    if (!empty($qtip_path)) {
+      $qtip_path .= '/jquery.qtip-1.0.0-rc3.min.js';
+    }
+  }
+  if (!$qtip_path) {
+    $qtip_path = drupal_get_path('module', 'os2web_cp_service') . '/js/jquery.qtip-1.0.0-rc3.min.js';
   }
+  drupal_add_js($qtip_path);
 
   drupal_add_js(drupal_get_path('module', 'os2web_cp_service') . '/js/os2web_cp_service.js');
   drupal_add_css(drupal_get_path('module', 'os2web_cp_service') . '/css/os2web_cp_service.css');