Merge branch 'master' of github.com:yfann/ImgCollector

Conflicts:
	contentscript.js

contentscript.js

@@ -1,9 +1,31 @@
 console.log("content script loaded");
-//$("img").css("border", "5px solid orange");
-function addborder(event) {
-    $(this).css("border", "5px solid orange");
-}
-function removeborder(event) {
-    $(this).css("border", "");
-}
-$("img").hover(addborder, removeborder);
+ var imges = [];
+        imges.contains = function (arr) {
+            for (var i = 0; i < this.length; i++) {
+                if (this[i] == arr)
+                    return true;
+            }
+            return false;
+        }
+
+        function addborder(event) {
+            $(this).css("border", "5px solid orange");
+        }
+        function removeborder(event) {
+            if (!imges.contains(this)) {
+                $(this).css("border", "");
+            }
+        }
+        $("img").hover(addborder, removeborder);
+
+        $("img").bind("click", function (event) {
+            if (!imges.contains(this)) {
+                imges.push(this);
+                $(this).css("border", "5px solid orange");
+            }
+            else {
+                imges.splice($.inArray(this, imges), 1);
+                $(this).css("border", "");
+            }
+        });
+