Skip to content

Touch screen integration #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wgossard wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Touch screen integration #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d847768
adding in touch eventing
wgossard Jul 19, 2017
f76953d
Adding touch event for app component list
wgossard Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions web-app/js/components/appcomponents/AppComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@
'</div>' +
'<div class="thumb-text ellipsis"><%- name %></div>'+
'<% if (details) { %>' +
'<a href="#" class="widget-details" style="visibility: hidden;"></a>' +
'<% if (style) { %>'+
'<a href="#" class="widget-details"></a>' +
'<% } else { %>'+
'<a href="#" class="widget-details" style="visibility: hidden;"></a>' +
'<% } %>'+
'<% } %>',

// boolean flag indicating whether or not to show details link
Expand All @@ -42,9 +46,14 @@
};
},

isMobile: function () {
return /Mobi/.test(navigator.userAgent);
},

render: function () {
var tpl = _.template(this.tpl, _.extend({
details: this.details
details: this.details,
style: this.isMobile()
}, this.model.attributes));

this.$el.append(tpl);
Expand Down
27 changes: 24 additions & 3 deletions web-app/js/components/appcomponents/AppComponentsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
events: {
'click .widget': '_onClick',
'click .widget-details': '_showDetailsTip',
'touchend .widget': '_onTouch',
'mouseenter .widget': '_showDetailsTipOption',
'mouseleave .widget': '_hideDetailsOption'
},
Expand Down Expand Up @@ -152,6 +153,18 @@
return SuperClass.prototype.remove.call(this);
},

_onTouch: function (evt) {
if(this.selectable && this._isMobile()) {
var view = $(evt.currentTarget).data('view');

if(this.selected) {
this.selected.$el.removeClass(this.selectClass);
}
this.selected = view;
this.selected.$el.addClass(this.selectClass);
}
},

_onClick: function (evt) {
if(this.selectable) {
var view = $(evt.currentTarget).data('view');
Expand Down Expand Up @@ -216,13 +229,21 @@
tip.shown();
},

_isMobile: function () {
return /Mobi/.test(navigator.userAgent);
},

_showDetailsTipOption: function (evt) {
this.$el.find('.widget-details').css('visibility', 'hidden');
$(evt.currentTarget).children('.widget-details').css('visibility', '');
if(!this._isMobile()) {
this.$el.find('.widget-details').css('visibility', 'hidden');
$(evt.currentTarget).children('.widget-details').css('visibility', '');
}
},

_hideDetailsOption: function (evt) {
$(evt.currentTarget).children('.widget-details').css('visibility', 'hidden');
if(!this._isMobile()) {
$(evt.currentTarget).children('.widget-details').css('visibility', 'hidden');
}
}

});
Expand Down
34 changes: 25 additions & 9 deletions web-app/js/components/window/MyAppsWindow.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Ext.define('Ozone.components.window.MyAppsWindow', {
_dragging: false,

initComponent: function() {

var me = this,
stackOrDashboards = [],
stacks = {}, dashboards = {},
Expand Down Expand Up @@ -143,7 +143,11 @@ Ext.define('Ozone.components.window.MyAppsWindow', {
},

getActions: function (values) {
return '<div class="details-btn hide"></div>';
if (/Mobi/.test(navigator.userAgent)) {
return '<div class="details-btn"></div>';
} else {
return '<div class="details-btn hide"></div>';
}

}
});
Expand Down Expand Up @@ -218,7 +222,8 @@ Ext.define('Ozone.components.window.MyAppsWindow', {
.on('mouseover', '.stack, .dashboard', $.proxy(me.onMouseOver, me))
.on('mouseout', '.stack, .dashboard', $.proxy(me.onMouseLeave, me))
.on('focus', '.stack, .dashboard', $.proxy(me.onMouseOver, me))
.on('blur', '.stack, .dashboard', $.proxy(me.onMouseLeave, me));
.on('blur', '.stack, .dashboard', $.proxy(me.onMouseLeave, me))
.on('touchend', '.dashboard', $.proxy(me.onDashboardTouch, me));

me.initKeyboardNav();

Expand Down Expand Up @@ -807,6 +812,15 @@ Ext.define('Ozone.components.window.MyAppsWindow', {
return $dashboard.hasClass('cls') ? $dashboard : $dashboard.parents('.' + cls);
},

onDashboardTouch: function (evt) {
if (evt.type !== 'touchend' && evt.which !== Ext.EventObject.ENTER)
return;

var $clickedDashboard = $(evt.currentTarget),
dashboard = this.getDashboard( $clickedDashboard );
this.launchDashboard(evt, dashboard);
},

onDashboardClick: function (evt) {
if (evt.type !== 'click' && evt.which !== Ext.EventObject.ENTER)
return;
Expand Down Expand Up @@ -1099,15 +1113,17 @@ Ext.define('Ozone.components.window.MyAppsWindow', {
},

onMouseOver: function (evt) {
var el = $(evt.currentTarget);
if (!/Mobi/.test(navigator.userAgent)) {
var el = $(evt.currentTarget);

if (this._previouslyHoveredStackOrDashboard != null) {
$('.details-btn', this._previouslyHoveredStackOrDashboard).addClass('hide');
}
if (this._previouslyHoveredStackOrDashboard != null) {
$('.details-btn', this._previouslyHoveredStackOrDashboard).addClass('hide');
}

$('.details-btn', el).removeClass('hide');
$('.details-btn', el).removeClass('hide');

this._previouslyHoveredStackOrDashboard = el;
this._previouslyHoveredStackOrDashboard = el;
}
},

onMouseLeave: function(evt) {
Expand Down