Skip to content

Commit eb5033c

Browse files
author
Himanshu Rajotia
committed
Merge pull request #722 from andrewhosgood/develop
Various updates and improvements
2 parents d71db32 + fafa621 commit eb5033c

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

src/core/js/device.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ define(function(require) {
3434
}
3535

3636
var onWindowResize = _.debounce(function onScreenSizeChanged() {
37-
Adapt.device.screenWidth = $window.width();
37+
Adapt.device.screenWidth = window.innerWidth || $window.width();
3838
Adapt.trigger('device:resize', Adapt.device.screenWidth);
3939
var newScreenSize = checkScreenSize();
4040

@@ -73,13 +73,27 @@ define(function(require) {
7373

7474
}
7575

76+
function pixelDensity() {
77+
var fltPixelDensity = ( window.devicePixelRatio || 1 );
78+
79+
if( fltPixelDensity >= 3 ) {
80+
return 'ultra-high';
81+
} else if( fltPixelDensity >= 2 ) {
82+
return 'high';
83+
} else if( fltPixelDensity >= 1.5 ) {
84+
return 'medium';
85+
} else {
86+
return 'low';
87+
}
88+
}
89+
7690
var browserString = browser + " version-" + version + " OS-" + OS;
7791
/* MAKE DEVICE IDENTIFICATION UNIFORM CASE */
7892
Adapt.device.browser = browser ? browser.toLowerCase() : "";
7993
Adapt.device.version = version ? version.toLowerCase() : "";
8094
Adapt.device.OS = OS ? OS.toLowerCase() : "";
8195
browserString = browserString.replace("Internet Explorer", "ie");
8296

83-
$("html").addClass(browserString);
97+
$("html").addClass(browserString + ' pixel-density-' + pixelDensity());
8498

8599
});

src/core/js/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ define(function(require) {
170170
var documentTitle = courseTitle + pageTitle;
171171

172172
Adapt.once("pageView:ready menuView:ready", function() {
173-
document.title = documentTitle;
173+
$('title').html(documentTitle);
174174
});
175175

176176
}

src/core/js/views/drawerView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ define(function(require) {
6565

6666
render: function() {
6767
var template = Handlebars.templates['drawer']
68-
$(this.el).html(template({_globals: Adapt.course.get("_globals")})).appendTo('body');
68+
$(this.el).html(template({_globals: Adapt.course.get("_globals")})).prependTo('body');
6969
var shadowTemplate = Handlebars.templates['shadow'];
70-
$(shadowTemplate()).appendTo('body');
70+
$(shadowTemplate()).prependTo('body');
7171
// Set defer on post render
7272
_.defer(_.bind(function() {
7373
this.postRender();

src/core/js/views/notifyView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ define(function(require) {
6464
//hide notify container
6565
this.$el.css("visibility", "hidden");
6666
//attach popup + shadow
67-
this.$el.html(template(data)).appendTo('body');
67+
this.$el.html(template(data)).prependTo('body');
6868
//hide popup
6969
this.$('.notify-popup').css("visibility", "hidden");
7070
//show notify container

0 commit comments

Comments
 (0)