Merge changes from topics "VID-8", "VID-7"

* changes:
  Add semicolon at the end
  Add a semicolon at the end of this statement

2 files changed, 7 insertions, 7 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js
index 1ca32034c..a26744d38 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js
@@ -64,7 +64,7 @@ var popupWindowDirective = function($log, $window) {
 		scrollPosition = {

 		    x : $window.pageXOffset,

 		    y : $window.pageYOffset

-		}

+		};

 		$window.scrollTo(0, 0);

 		element.css("display", "table");

 		element.prev().css("display", "block");

@@ -74,7 +74,7 @@ var popupWindowDirective = function($log, $window) {
 		$window.scrollTo(scrollPosition.x, scrollPosition.y);

 	    }

 	});

-    }

+    };

 

     return {

 	restrict : "EA",

@@ -83,6 +83,6 @@ var popupWindowDirective = function($log, $window) {
 	link : link,

 	template : '<table style="display: none; position: absolute; left: 0; top: 0; width: 100%; height: 100%; border-collapse: collapse; margin: 0; padding: 0"> <tr><td align="center" style="vertical-align: top; padding: 10px"><div style="display: inline-block; padding: 5px; background-color: white" ng-transclude></div></td></tr></table>'

     };

-}

+};

 

 appDS2.directive("popupWindow", [ "$log", "$window", popupWindowDirective ]);

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js
index 2f60d65dc..8294597bd 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js
@@ -127,7 +127,7 @@ var progressBarDirective = function() {
 	     */

 	    element.html("");

 	}

-    }

+    };

 

     return {

 	restrict : "EA",

@@ -153,7 +153,7 @@ var progressBarDirective = function() {
 	    control.reset = function() {

 		previousValue = 0;

 		updateProgress(element, attrs, 0);

-	    }

+	    };

 

 	    attrs.$observe("value", function(valueString) {

 		updateProgress(element, attrs, valueString);

@@ -167,7 +167,7 @@ var progressBarDirective = function() {
 		}

 	    });

 	}

-    }

-}

+    };

+};

 

 appDS2.directive("progressBar", progressBarDirective);