Merge branch 'master' of github.com:angular/angular.js into future

1 files changed, 17 insertions, 0 deletions

diff --git a/src/jqLite.js b/src/jqLite.js
index 68172fd8..cff9ae00 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -36,6 +36,23 @@ function jqClearData(element) {
   }
 }
 
+function getStyle(element) {
+  var current = {}, style = element[0].style, value, name, i;
+  if (typeof style.length == 'number') {
+    for(i = 0; i < style.length; i++) {
+      name = style[i];
+      current[name] = style[name];
+    }
+  } else {
+    for (name in style) {
+      value = style[name];
+      if (1*name != name && name != 'cssText' && value && typeof value == 'string' && value !='false')
+        current[name] = value;
+    }
+  }
+  return current;
+}
+
 function JQLite(element) {
   if (isElement(element)) {
     this[0] = element;