Return-Path: 
 <commits-return-5730-apmail-kylin-commits-archive=kylin.apache.org@kylin.apache.org>
X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org
Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9C5C0183AE
	for <apmail-kylin-commits-archive@minotaur.apache.org>;
 Tue, 12 Jan 2016 09:43:24 +0000 (UTC)
Received: (qmail 44897 invoked by uid 500); 12 Jan 2016 09:43:24 -0000
Delivered-To: apmail-kylin-commits-archive@kylin.apache.org
Received: (qmail 44868 invoked by uid 500); 12 Jan 2016 09:43:24 -0000
Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@kylin.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@kylin.apache.org>
List-Post: <mailto:commits@kylin.apache.org>
List-Id: <commits.kylin.apache.org>
Reply-To: dev@kylin.apache.org
Delivered-To: mailing list commits@kylin.apache.org
Received: (qmail 44859 invoked by uid 99); 12 Jan 2016 09:43:24 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2016 09:43:24 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 4DF3DE021A; Tue, 12 Jan 2016 09:43:24 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: zhongjian@apache.org
To: commits@kylin.apache.org
Message-Id: <be7e447ab4e740ebb936a3bd9bc19ed0@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: kylin git commit: KYLIN-1251 enable nav tree expand and hide funciton
Date: Tue, 12 Jan 2016 09:43:24 +0000 (UTC)

Repository: kylin
Updated Branches:
  refs/heads/2.0-rc b0ecfe750 -> d7eccda44


KYLIN-1251 enable nav tree expand and hide funciton


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d7eccda4
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d7eccda4
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d7eccda4

Branch: refs/heads/2.0-rc
Commit: d7eccda448f380328ff740679537a5e74fda6f4a
Parents: b0ecfe7
Author: jian <zhongjian@apache.org>
Authored: Tue Jan 12 17:39:16 2016 +0800
Committer: jian <zhongjian@apache.org>
Committed: Tue Jan 12 17:42:58 2016 +0800

----------------------------------------------------------------------
 pom.xml                                         |  2 +-
 .../js/directives/kylin_abn_tree_directive.js   | 34 ++++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/d7eccda4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a7a764..325b58a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -917,8 +917,8 @@
                                 <exclude>dictionary/metastore_db/**</exclude>
 
                                 <!-- MIT license -->
-                                <exclude>webapp/app/css/AdminLTE-fonts.css</exclude>
                                 <exclude>webapp/app/css/AdminLTE.css</exclude>
+                                <exclude>webapp/app/js/directives/kylin_abn_tree_directive.js</exclude>
 
                                 <!--configuration file -->
                                 <exclude>webapp/app/routes.json</exclude>

http://git-wip-us.apache.org/repos/asf/kylin/blob/d7eccda4/webapp/app/js/directives/kylin_abn_tree_directive.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/directives/kylin_abn_tree_directive.js b/webapp/app/js/directives/kylin_abn_tree_directive.js
index b2b2bd0..a3023ab 100644
--- a/webapp/app/js/directives/kylin_abn_tree_directive.js
+++ b/webapp/app/js/directives/kylin_abn_tree_directive.js
@@ -1,19 +1,24 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * The MIT License (MIT)
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright (c) 2013 Nick Perkins
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ *   subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 (function() {
@@ -26,7 +31,7 @@
     '$timeout', function($timeout) {
       return {
         restrict: 'E',
-        template: "<ul class=\"nav nav-list nav-pills nav-stacked abn-tree\">\n  <li ng-repeat=\"row in tree_rows | filter:{visible:true} track by row.branch.uid\" ng-animate=\"'abn-tree-animate'\" ng-class=\"'level-' + {{ row.level }} + (row.branch.selected ? ' active':'') + ' ' +row.classes.join(' ')\" class=\"abn-tree-row\"><a ng-click=\"user_clicks_branch(row.branch)\" ng-dblclick=\"user_dbClicks_branch(row.branch)\"><i ng-class=\"row.tree_icon\" ng-click=\"row.branch.expanded = !row.branch.expanded\" class=\"indented tree-icon\"> </i><span class=\"indented tree-label\">{{ row.label }} </span></a></li>\n</ul>",
+        template: "<ul class=\"nav nav-list nav-pills nav-stacked abn-tree\">\n  <li ng-repeat=\"row in tree_rows | filter:{visible:true} track by row.branch.uid\" ng-animate=\"'abn-tree-animate'\" ng-class=\"'level-' + {{ row.level }} + (row.branch.selected ? ' active':'') + ' ' +row.classes.join(' ')\" class=\"abn-tree-row\"><a ng-click=\"user_clicks_branch(row.branch)\" ng-dblclick=\"user_dbClicks_branch(row.branch)\"><i ng-class=\"row.tree_icon\" class=\"indented tree-icon\"> </i><span class=\"indented tree-label\">{{ row.label }} </span></a></li>\n</ul>",
         replace: true,
         scope: {
           treeData: '=',
@@ -122,6 +127,7 @@
             }
           };
           scope.user_clicks_branch = function(branch) {
+            branch.expanded = !branch.expanded;
             if (branch !== selected_branch) {
               return select_branch(branch);
             }