small output related fixes; and indentation ;)

edgeryders · Jan 24, 2015 · 8c75f22 · 8c75f22
1 parent 0f41129
commit 8c75f22
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 53 deletions.
diff --git a/drupal_annotation/annotation.controller.inc b/drupal_annotation/annotation.controller.inc
@@ -81,7 +81,7 @@ class AnnotationAPIController extends EntityAPIController {
 
     if ($entity->tid != NULL) {
       $term = taxonomy_term_load($entity->tid);
-      $term_markup = l($term->name, "taxonomy/term/$term->tid") . " (tid: $term->tid)";
+      $term_markup = l($term->name, "taxonomy/term/{$term->tid}") . " (tid: {$term->tid})";
     }
     else { 
       $term_markup = '';
@@ -110,22 +110,18 @@ class AnnotationAPIController extends EntityAPIController {
   }
 }
 
-function get_properties($obj, $values=false)
-{
-    $obj_dump  = print_r($obj, 1);
-    $matches =  array();
-    preg_match_all('/^\s+\[(\w+).*\] => (\w*)/m', $obj_dump, $matches);
-    if ($values)
-    {
-        $output = array();
-        foreach ($matches[1] as $key => $property)
-        {
-            $output[$property] = $matches[2][$key];
-        }
-        return $output;
-    }
-    else
-    {
-        return $matches[1];
+function get_properties($obj, $values=false) {
+  $obj_dump  = print_r($obj, 1);
+  $matches =  array();
+  preg_match_all('/^\s+\[(\w+).*\] => (\w*)/m', $obj_dump, $matches);
+  if ($values) {
+    $output = array();
+    foreach ($matches[1] as $key => $property) {
+      $output[$property] = $matches[2][$key];
     }
+    return $output;
+  }
+  else {
+    return $matches[1];
+  }
 }
diff --git a/drupal_annotation/js/annotator_store.js b/drupal_annotation/js/annotator_store.js
@@ -1,5 +1,6 @@
 (function ($) {
   Drupal.behaviors.annotatorStore = {
+
     attach: function (context, settings) {
       Drupal.Annotator.annotator('addPlugin', 'Store', {
         prefix: settings.annotator_store.prefix,
@@ -10,11 +11,12 @@
           'type': 'annotator'
         },
         loadFromSearch: function(that){
-	    	  return {
-			      'nid': jQuery(that.element).parents('.node').attr('id').split('-')[1]
+          return {
+            'nid': jQuery(that.element).parents('.node').attr('id').split('-')[1]
           };
-	      },
+	    },
       });
     }
+
   };
 })(jQuery);
diff --git a/drupal_annotation/plugins/annotator/StoreAnnotatorPlugin.inc b/drupal_annotation/plugins/annotator/StoreAnnotatorPlugin.inc
@@ -9,4 +9,3 @@ $plugin = array(
     'class' => 'StoreAnnotatorPlugin',
   ),
 );
-
diff --git a/drupal_annotator/js/annotator_drupalnode.js b/drupal_annotator/js/annotator_drupalnode.js
@@ -2,46 +2,53 @@
 var _ref,
   __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
   __hasProp = {}.hasOwnProperty,
-  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-Annotator.Plugin.DrupalNode = (function(_super) {
-      __extends(DrupalNode, _super);
-    function DrupalNode(element) {
-      return DrupalNode.__super__.constructor.apply(this, arguments);
+  __extends = function(child, parent) { 
+    for (var key in parent) { 
+      if (__hasProp.call(parent, key)) child[key] = parent[key];       
     } 
+    function ctor() { this.constructor = child; } 
+    ctor.prototype = parent.prototype; 
+    child.prototype = new ctor(); 
+    child.__super__ = parent.prototype; 
+    return child;
+  };
 
-    DrupalNode.prototype.pluginInit = function() {
-      if (!Annotator.supported()) {
-        return;
-      }
-
+Annotator.Plugin.DrupalNode = (function(_super) {
+  __extends(DrupalNode, _super);
+
+  function DrupalNode(element) {
+    return DrupalNode.__super__.constructor.apply(this, arguments);
+  } 
+
+  DrupalNode.prototype.pluginInit = function() {
+    if (!Annotator.supported()) {
+      return;
+    }
+
     this.annotator.subscribe(
       'annotationEditorSubmit', 
       function(editor, annotation) {
         annotation.nid = editor.element.parents('.node').attr('id').split('-').slice(-1).pop();
       }
     );
-
-	this.annotator.subscribe('annotationsLoaded', function(annotations){
-	        jQuery('.annotator-hl').each(function(){
-		    if(
-			jQuery(this).data('annotation').user.uid == Drupal.settings.annotator_permissions.user.uid){
-			jQuery(this).addClass('annotator-own-annotation');
-		    }
-		    else {
-			jQuery(this).addClass('annotator-others-annotation');
-		    }
-		}
-					    );
-	});
-
-
 
-
-    };
-    return DrupalNode;
-
-  })(Annotator.Plugin);
+    this.annotator.subscribe(
+      'annotationsLoaded', 
+      function(annotations) {
+        jQuery('.annotator-hl').each(function() {
+          if (jQuery(this).data('annotation').user.uid == Drupal.settings.annotator_permissions.user.uid) {
+            jQuery(this).addClass('annotator-own-annotation');
+          }
+          else {
+            jQuery(this).addClass('annotator-others-annotation');
+          }
+        });
+      }
+    );
+  };
+
+  return DrupalNode;
+})(Annotator.Plugin);
 
 (function ($) {
   Drupal.behaviors.annotatorDrupalNode = {