[Mobile] Merge3

Set the placement of hamburger button as before
however moved it into browse.html and tied to
slide pane model.
This commit is contained in:
Shivam Dave 2015-08-28 11:46:21 -07:00
parent d8e9b0e8e8
commit 43523046da
3 changed files with 10 additions and 14 deletions

View File

@ -21,18 +21,11 @@
-->
<span ng-controller="BrowseObjectController">
<div class="object-browse-bar bar l-flex">
<!--<div class="key-properties ui-symbol icon mobile-menu-icon desktop-hide" ng-click="treeSlide()">m</div>-->
<!--<div class="pane-tabs left"-->
<!--<div class="pane-tabs left mobile-hide"-->
<!--ng-class="{inactivePane: !ngModel.leftPane, activePane: ngModel.leftPane}"-->
<!--ng-click="ngModel.leftPane = !ngModel.leftPane">-->
<!--</div>-->
<div class="key-properties ui-symbol icon mobile-menu-icon pane-tabs left"
ng-class="{inactivePane: !ngModel.leftPane, activePane: ngModel.leftPane}"
ng-click="ngModel.leftPane = !ngModel.leftPane">m
</div>
<div class="items-select left">
<mct-representation key="'back-arrow'"
class="l-back">
@ -55,10 +48,10 @@
</mct-representation>
</div>
<div class="pane-tabs right"
ng-class="{inactivePane: !ngModel.rightPane, activePane: ngModel.rightPane}"
ng-click="ngModel.rightPane = !ngModel.rightPane">
</div>
<!--<div class="pane-tabs right"-->
<!--ng-class="{inactivePane: !ngModel.rightPane, activePane: ngModel.rightPane}"-->
<!--ng-click="ngModel.rightPane = !ngModel.rightPane">-->
<!--</div>-->
</div>

View File

@ -104,10 +104,13 @@
<!--</div>-->
<!--</div>-->
<div class="key-properties ui-symbol icon mobile-menu-icon desktop-hide"
ng-click="paneModel.leftPane = !paneModel.leftPane">m</div>
<!--</mct-split-pane>-->
</div>
<!-- PANE RIGHT-->
</mct-split-pane>
</div>

View File

@ -239,7 +239,7 @@ define(
// If the user has selected an object (and is portrait
// on a phone), then hide the tree menu
$scope.$on("select-obj", function () {
$scope.treeSlide();
//$scope.treeSlide();
});
$scope.backArrow = navigateToParent;