diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html
index b4003a8a9b..c718bed951 100644
--- a/platform/commonUI/browse/res/templates/back-arrow.html
+++ b/platform/commonUI/browse/res/templates/back-arrow.html
@@ -22,6 +22,7 @@
+ ng-click='backArrow()'
+ ng-class="checkRoot(); atRoot ? 'mobile-back-hide' : 'mobile-back-unhide'">
<
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html
index a7bb8029fc..84cc087bbc 100644
--- a/platform/commonUI/browse/res/templates/browse/object-header.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header.html
@@ -24,7 +24,7 @@
{{type.getGlyph()}}
{{parameters.mode}}
- {{type.getName()}}
+ {{type.getName()}}
{{model.name}}
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js
index cc4f06b243..e791ae17ef 100644
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -132,10 +132,31 @@ define(
// is not the root, then user is navigated to
// parent
function navigateToParent() {
- var parent = navigationService.getNavigation().getCapability('context').getParent();
+ var parent = navigationService.getNavigation().getCapability('context').getParent(),
+ grandparent;
if (parent.getId() !== ROOT_ID) {
+ grandparent = parent.getCapability('context').getParent().getId();
navigateTo(parent);
+ if (grandparent && grandparent !== ROOT_ID) {
+ $scope.atRoot = false;
+ } else {
+ $scope.atRoot = true;
+ }
+ } else {
+ $scope.atRoot = true;
}
+ console.log($scope.atRoot);
+ }
+
+ function checkRoot() {
+ var parent = navigationService.getNavigation().getCapability('context').getParent(),
+ grandparent;
+ if (parent.getId() !== ROOT_ID) {
+ $scope.atRoot = false;
+ } else {
+ $scope.atRoot = true;
+ }
+ console.log($scope.atRoot);
}
// Load the root object, put it in the scope.
@@ -170,6 +191,8 @@ define(
});
$scope.backArrow = navigateToParent;
+
+ $scope.checkRoot = checkRoot;
}
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index 638a08c9b6..e894e4d472 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -901,23 +901,59 @@ mct-container {
display: none; } }
@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
- /* line 184, ../sass/mobile/_layout.scss */
- .mobile-unhide {
- display: inline-block; } }
+ /* line 183, ../sass/mobile/_layout.scss */
+ .mobile-important-hide {
+ display: none !important; } }
+
+@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
+ /* line 189, ../sass/mobile/_layout.scss */
+ .mobile-back-hide {
+ pointer-events: none;
+ -moz-transition-property: opacity;
+ -o-transition-property: opacity;
+ -webkit-transition-property: opacity;
+ transition-property: opacity;
+ -moz-transition-duration: 0.4s;
+ -o-transition-duration: 0.4s;
+ -webkit-transition-duration: 0.4s;
+ transition-duration: 0.4s;
+ -moz-transition-timing-function: ease-in-out;
+ -o-transition-timing-function: ease-in-out;
+ -webkit-transition-timing-function: ease-in-out;
+ transition-timing-function: ease-in-out;
+ opacity: 0; } }
+
+@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
+ /* line 198, ../sass/mobile/_layout.scss */
+ .mobile-back-unhide {
+ pointer-events: all;
+ -moz-transition-property: opacity;
+ -o-transition-property: opacity;
+ -webkit-transition-property: opacity;
+ transition-property: opacity;
+ -moz-transition-duration: 0.4s;
+ -o-transition-duration: 0.4s;
+ -webkit-transition-duration: 0.4s;
+ transition-duration: 0.4s;
+ -moz-transition-timing-function: ease-in-out;
+ -o-transition-timing-function: ease-in-out;
+ -webkit-transition-timing-function: ease-in-out;
+ transition-timing-function: ease-in-out;
+ opacity: 1; } }
@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) {
- /* line 191, ../sass/mobile/_layout.scss */
+ /* line 207, ../sass/mobile/_layout.scss */
.phone-hide {
display: none; } }
@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
- /* line 197, ../sass/mobile/_layout.scss */
+ /* line 213, ../sass/mobile/_layout.scss */
.tree-holder {
overflow-x: hidden !important; } }
@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
- /* line 202, ../sass/mobile/_layout.scss */
- .disable-select {
+ /* line 218, ../sass/mobile/_layout.scss */
+ .mobile-disable-select {
-moz-user-select: -moz-none;
-ms-user-select: none;
-webkit-user-select: none;
diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss
index 85b0f3d755..3f4fc062d3 100644
--- a/platform/commonUI/general/res/sass/mobile/_layout.scss
+++ b/platform/commonUI/general/res/sass/mobile/_layout.scss
@@ -180,10 +180,26 @@
}
}
-// Hides objects on phone and tablet
-.mobile-unhide {
+.mobile-important-hide {
@include phoneandtablet {
- display: inline-block;
+ display: none !important;
+ }
+}
+
+.mobile-back-hide {
+ @include phoneandtablet {
+ pointer-events: none;
+ @include trans-prop-nice(opacity, .4s);
+ opacity: 0;
+ }
+}
+
+// Hides objects on phone and tablet
+.mobile-back-unhide {
+ @include phoneandtablet {
+ pointer-events: all;
+ @include trans-prop-nice(opacity, .4s);
+ opacity: 1;
}
}
@@ -199,7 +215,7 @@
overflow-x: hidden !important;
}
}
-.disable-select {
+.mobile-disable-select {
@include phoneandtablet {
@include user-select(none);
}
diff --git a/platform/commonUI/general/res/templates/bottombar.html b/platform/commonUI/general/res/templates/bottombar.html
index bfe9974b52..4da2686fa1 100644
--- a/platform/commonUI/general/res/templates/bottombar.html
+++ b/platform/commonUI/general/res/templates/bottombar.html
@@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
-