updating latest changes

vteial · May 28, 2013 · c78af29 · c78af29
1 parent d1f35be
commit c78af29
Show file tree

Hide file tree

Showing 15 changed files with 387 additions and 131 deletions.
diff --git a/src/main/webapp/about.html b/src/main/webapp/about.html
@@ -1,9 +1,4 @@
 <p>
-	<b>App Id</b> : {{appId}}<br/>
-	<b>App Version </b>{{ ': %VERSION%.' | interpolate }}<br/> 
+	<b>App Id - Version</b> : {{appId}} - {{appVersion}}<br/>
+	<b>Interpolate eg. </b>{{ ': %VERSION%.' | interpolate }}<br/> 
 </p>
-<div class="form-inline">
-	<label>Alert Message : <input type="text" class="input-xlarge" ng-model="alertMessage"></label>
-	&nbsp;&nbsp;
-	<button class='btn' ng-click="addAlert()">Add Alert</button>
-</div>
diff --git a/src/main/webapp/alert.html b/src/main/webapp/alert.html
@@ -1,7 +1,27 @@
+<div class="container">
+<div class="row">
+	<div class="span11">
+		<alerts></alerts>
+	</div>
+	<div class="span1">
+		<button class="btn btn-link pull-right" ng-show="alerts.messages.length > 1" ng-click="alerts.removeAll()">Clear All</button>
+	</div>
+</div>	
+</div>
+
+<!-- 
 <div class="container" ng-controller="alertController">
-	<alert ng-repeat="alert in alerts" type="alert.type"
-		close="close($index)">{{alert.msg}}</alert>
-
+
+<div class="row">
+	<div class="span10">
+		<alert ng-repeat="alert in alerts" type="alert.type"
+			close="close($index)">{{alert.msg}}</alert>
+	</div>
+	<div class="span2">
 	<button class="btn btn-link pull-right" ng-show="alerts.length > 1"
 		ng-click="closeAll()">Clear All</button>
-</div>
+</div>
+		
+</div>
+
+-->
diff --git a/src/main/webapp/appContext.json b/src/main/webapp/appContext.json
@@ -0,0 +1,4 @@
+{
+	"appId" : "browserconsole",
+	"appVersion" : 0.1
+}
diff --git a/src/main/webapp/assets/js/angular-registry.js b/src/main/webapp/assets/js/angular-registry.js
@@ -0,0 +1,75 @@
+'use strict';
+
+/**
+ * @name        angular-registry
+ * @description A Registry Module for AngularJS
+ * @author      Johannes Troeger <johannes.troeger@gmail.com>
+ * @repository  https://github.com/johannestroeger/angular-registry
+ * @license     http://www.wtfpl.net/ WTFPL – Do What the Fuck You Want to Public License
+ * @version     0.2.2
+ */
+
+angular.module('johannestroeger.registry', [])
+
+.provider('$registry', function () {
+
+  var register = {};
+  var defaults = {};
+  var cacheLimit = 100;
+
+  this.defaults = function (obj) {
+    angular.extend(defaults, obj);
+    angular.extend(register, angular.copy(defaults));
+  };
+
+  this.cacheLimit = function (limit) {
+    cacheLimit = limit;
+  };
+
+  this.$get = function ($parse, $cacheFactory) {
+    var cache = $cacheFactory('johannestroeger.registry', {
+      capacity: cacheLimit
+    });
+
+    var fnCache = function (exp) {
+      if(!cache.get(exp)) {
+        cache.put(exp, $parse(exp));
+      }
+
+      return cache.get(exp);
+    };
+
+    var registry = function (root, exp, value, del) {
+      if(!exp) {
+        return root;
+      }
+
+      var getter = fnCache(exp);
+
+      if(value || del) {
+        return getter.assign(root, value);
+      }
+
+      return getter(root);
+    };
+
+    return {
+      set: function (exp, value) {
+        return registry(register, exp, value);
+      },
+      get: function (exp) {
+        return registry(register, exp);
+      },
+      del: function (exp) {
+        return registry(register, exp, undefined, true);
+      },
+      reset: function(exp) {
+        if(exp) {
+          return registry(register, exp, angular.copy(registry(defaults, exp)));
+        }
+        register = {};
+        return angular.extend(register, defaults);
+      }
+    };
+  };
+});
diff --git a/src/main/webapp/controllers.js b/src/main/webapp/controllers.js
@@ -19,114 +19,122 @@ appControllers.controller('alertController', function($scope, alertService) {
 
 });
 
-appControllers.controller('homeController', function($scope, $log) {
+appControllers.controller('homeController', function($scope, $log, $registry) {
 	$scope.message = 'Welcome to Home!';
 });
 
-appControllers.controller('webSqlController', function($scope, $log,
-		alertService, webSqlService) {
-	$scope.alerts = alertService;
-
-	$scope.recentQueries = [];
-	$scope.columns = [];
-	$scope.records = [];
-	$scope.query = 'select * from employee';
-	$scope.queries = [ $scope.query ];
-	$scope.message = '';
-	$scope.tabs = {
-		result : false,
-		console : true,
-		help : false
-	};
+appControllers.controller('webSqlController',
+		function($scope, $log, $registry, alertService, webSqlService) {
+			$scope.alerts = alertService;
+
+			$scope.recentQueries = [];
+			$scope.columns = [];
+			$scope.records = [];
+			// $scope.query = 'select * from employee';
+			$scope.queries = [ $scope.query ];
+			$scope.message = '';
+			$scope.tabs = {
+				result : false,
+				console : true,
+				help : false
+			};
+
+			$scope.run = run;
+
+			function init() {
 
-	$scope.run = run;
-
-	function init() {
-
-	}
-
-	function run() {
-		$scope.query = $scope.query.toLowerCase();
-		if ($scope.query.match(/^select.*/)) {
-			webSqlService.process([ $scope.query ], onSuccessSelect, onFailure);
-		} else {
-			webSqlService.process([ $scope.query ], onSuccess, onFailure);
-		}
-	}
-
-	function onSuccessSelect(transaction, results, records) {
-		$scope.queries.push($scope.query);
-		message = 'Success : ' + $scope.query + "\n";
-		if (records.length > 0) {
-			var columns = [];
-			for ( var prop in records[0]) {
-				columns.push(prop);
 			}
-			//$log.info(columns);
-			$scope.columns = columns;
-			$scope.records = records;
-		}
-		$scope.message = message;
-
-		var index = $scope.recentQueries.indexOf($scope.query);
-		if (index != -1) {
-			$scope.recentQueries.splice(index, 1);
-		}
-		$scope.recentQueries.unshift($scope.query);
-
-		$scope.tabs.result = true;
-		$scope.$apply();
-		//$log.info($scope.message);
-	}
-
-	function onSuccess() {
-		$scope.queries.push($scope.query);
-		var message = 'Success : ' + $scope.query;
-		$scope.message = message;
-
-		var index = $scope.recentQueries.indexOf($scope.query);
-		if (index != -1) {
-			$scope.recentQueries.splice(index, 1);
-		}
-		$scope.recentQueries.unshift($scope.query);
-
-		$scope.tabs.console = true;
-		$scope.$apply();
-		//$log.info($scope.message);
-	}
-
-	function onFailure(error, statement) {
-		var message = 'Error : ' + error.message + " when processing "
-				+ statement;
-		$scope.message = message;
-		$scope.tabs.console = true;
-		$scope.$apply();
-		//$log.warn(message);
-	}
 
-});
+			function run() {
+				$scope.query = $scope.query.toLowerCase();
+				if ($scope.query.match(/^select.*/)) {
+					webSqlService.process([ $scope.query ], onSuccessSelect,
+							onFailure);
+				} else {
+					webSqlService.process([ $scope.query ], onSuccess,
+							onFailure);
+				}
+			}
+
+			function onSuccessSelect(transaction, results, records) {
+				$scope.queries.push($scope.query);
+				message = 'Success : ' + $scope.query + "\n";
+				if (records.length > 0) {
+					var columns = [];
+					for ( var prop in records[0]) {
+						columns.push(prop);
+					}
+					// $log.info(columns);
+					$scope.columns = columns;
+					$scope.records = records;
+				}
+				$scope.message = message;
+
+				var index = $scope.recentQueries.indexOf($scope.query);
+				if (index != -1) {
+					$scope.recentQueries.splice(index, 1);
+				}
+				$scope.recentQueries.unshift($scope.query);
+
+				$scope.tabs.result = true;
+				$scope.$apply();
+				// $log.info($scope.message);
+			}
+
+			function onSuccess() {
+				$scope.queries.push($scope.query);
+				var message = 'Success : ' + $scope.query;
+				$scope.message = message;
+
+				var index = $scope.recentQueries.indexOf($scope.query);
+				if (index != -1) {
+					$scope.recentQueries.splice(index, 1);
+				}
+				$scope.recentQueries.unshift($scope.query);
+
+				$scope.tabs.console = true;
+				$scope.$apply();
+				// $log.info($scope.message);
+			}
+
+			function onFailure(error, statement) {
+				var message = 'Error : ' + error.message + " when processing "
+						+ statement;
+				$scope.message = message;
+				$scope.tabs.console = true;
+				$scope.$apply();
+				// $log.warn(message);
+			}
+
+		});
 
 appControllers.controller('indexedDbController', function($scope, $log,
-		alertService, appContext) {
+		$registry, alertService) {
 	$scope.alerts = alertService;
 
 	$scope.message = 'Welcome to IndexedDb!';
 });
 
-appControllers.controller('aboutController', function($scope, $log,
-		alertService, appContext) {
-	$scope.alerts = alertService;
-
-	$scope.appId = appContext.appId;
+appControllers.controller('aboutController', function($scope, $log, $registry) {
+	$scope.appId = $registry.get('appId');
+	$scope.appVersion = $registry.get('appVersion');
+});
 
-	$scope.addAlert = function() {
-		$scope.alerts.push({
-			msg : $scope.alertMessage
-		});
-	};
+appControllers.controller('testController', function($scope, $log, $registry,
+		alertService) {
+	$scope.message = 'Test View';
 
+	$scope.alerts = alertService;
+	$scope.error = 'An error occurred';
+	$scope.warning = 'An warning occurred';
+	$scope.success = 'Ok';
 });
 
-appControllers.controller('errorController', function($scope, $log) {
-	$scope.message = 'Oops, Something went wrong!';
-});
+/*
+ * var http = $http.get('appContext.json'); http.success(function(response,
+ * status, headers, config) { $log.info('success...'); $scope.data = response;
+ * appContext = angular.copy(response); $log.info(appContext); $log.info('Status = ' +
+ * status); }); http.error(function(response, status, headers, config) {
+ * $log.info('error...'); $log.error(response); $log.info('Status = ' + status);
+ * });
+ */
diff --git a/src/main/webapp/directives.js b/src/main/webapp/directives.js
@@ -6,4 +6,4 @@ appDirectives.directive('appVersion', [ 'version', function(version) {
 	return function(scope, elm, attrs) {
 		elm.text(version);
 	};
-} ]);
+} ]);
diff --git a/src/main/webapp/error.html b/src/main/webapp/error.html
diff --git a/src/main/webapp/filters.js b/src/main/webapp/filters.js
@@ -5,5 +5,5 @@ var appFilters = angular.module('app.filters', []);
 appFilters.filter('interpolate', [ 'version', function(version) {
 	return function(text) {
 		return String(text).replace(/\%VERSION\%/mg, version);
-	}
+	};
 } ]);
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -23,9 +23,13 @@
 	<script src="assets/js/angular-ui-states.min.js" type="text/javascript"></script>
 	<script src="assets/js/ui-bootstrap-tpls-0.3.0.min.js" type="text/javascript"></script>
 
+	<script src="assets/js/angular-registry.js" type="application/javascript"></script>
+
 	<script src="assets/js/html5sql.js" type="application/javascript"></script>
 	<script src="assets/js/ztt-ydn.db-0.6.6.js" type="application/javascript"></script>
-
+
+	<script src="wydAngular.js" type="application/javascript"></script>
+
 	<script src="filters.js" type="application/javascript"></script>
 	<script src="directives.js" type="application/javascript"></script>
 	<script src="services.js" type="application/javascript"></script>

diff --git a/src/main/webapp/main.js b/src/main/webapp/main.js
@@ -1,5 +1,11 @@
-var dependents = [ 'ui.bootstrap', 'ui.utils', 'ui.compat', 'app.filters',
-		'app.services', 'app.directives', 'app.controllers' ];
+var dependents = [ 'ui.bootstrap', 'ui.utils', 'ui.compat',
+		 'app.filters', 'app.services',
+		'app.directives', 'app.controllers' ];
+
+dependents.push('johannestroeger.registry');
+dependents.push('wydAngular.filters');
+dependents.push('wydAngular.services');
+dependents.push('wydAngular.directives');
 
 var app = angular.module('app', dependents);