eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yonzhang2...@apache.org
Subject incubator-eagle git commit: EAGLE-357. Fix building fail when jshint Fix building fail when jshint
Date Mon, 11 Jul 2016 23:15:41 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/branch-0.3.1 5a7689eae -> 1c1ffec77


EAGLE-357. Fix building fail when jshint
Fix building fail when jshint

Author: Huizhi, Lu <hnlu@ebay.com>
Reviewer: Yong, Zhang <yonzhang2012@apache.org>

Closes: #261


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/1c1ffec7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/1c1ffec7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/1c1ffec7

Branch: refs/heads/branch-0.3.1
Commit: 1c1ffec776a0fa0860983f004c450453405455be
Parents: 5a7689e
Author: yonzhang <yonzhang2012@gmail.com>
Authored: Mon Jul 11 16:18:51 2016 -0700
Committer: yonzhang <yonzhang2012@gmail.com>
Committed: Mon Jul 11 16:18:51 2016 -0700

----------------------------------------------------------------------
 .../webapp/app/public/feature/common/controller.js     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/1c1ffec7/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js b/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
index ee1597c..83ca6ae 100644
--- a/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
+++ b/eagle-webservice/src/main/webapp/app/public/feature/common/controller.js
@@ -489,15 +489,16 @@
 						// >> Parse expression
 						$scope.policy.__.conditions = {};
 						var _condition = _policyUnit.expression.match(/from\s+(\w+)(\[(.*)])?(#window[^\)]*\))?\s+(select
(\w+, )?(\w+)\((\w+)\) as [\w\d_]+ (group by (\w+) )?having ([\w\d_]+) ([<>=]+) ([^\s]+))?/);
+                        var _cond_stream, _cond_query, _cond_window, _cond_group, _cond_groupUnit;
 
 						if(!_condition) {
 							$scope.policy.__.advanced = true;
 						} else {
-							var _cond_stream = _condition[1];
-							var _cond_query = _condition[3] || "";
-							var _cond_window = _condition[4];
-							var _cond_group = _condition[5];
-							var _cond_groupUnit = _condition.slice(7,14);
+							_cond_stream = _condition[1];
+							_cond_query = _condition[3] || "";
+							_cond_window = _condition[4];
+							_cond_group = _condition[5];
+							_cond_groupUnit = _condition.slice(7,14);
 
 							// > StreamName
 							var _streamName = _cond_stream;
@@ -1021,4 +1022,4 @@
 			return Number(_time);
 		};
 	});
-})();
\ No newline at end of file
+})();


Mime
View raw message