Skip to content

bug fixed. #53

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
cdcchen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bug fixed. #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions src/flexible.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
var metaEl = doc.querySelector('meta[name="viewport"]');
var flexibleEl = doc.querySelector('meta[name="flexible"]');
var dpr = 0;
var scale = 0;
var scale = initialScale = 0;
var tid;
var flexible = lib.flexible || (lib.flexible = {});
var devicePixelRatio = win.devicePixelRatio;

if (metaEl) {
console.warn('将根据已有的meta标签来设置缩放比例');
var match = metaEl.getAttribute('content').match(/initial\-scale=([\d\.]+)/);
if (match) {
scale = parseFloat(match[1]);
scale = initialScale = parseFloat(match[1]);
dpr = parseInt(1 / scale);
}
} else if (flexibleEl) {
Expand All @@ -22,6 +23,9 @@
var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/);
if (initialDpr) {
dpr = parseFloat(initialDpr[1]);
if (devicePixelRatio < dpr) {
dpr = devicePixelRatio;
}
scale = parseFloat((1 / dpr).toFixed(2));
}
if (maximumDpr) {
Expand All @@ -31,7 +35,7 @@
}
}

if (!dpr && !scale) {
if (!dpr || !scale) {
var isAndroid = win.navigator.appVersion.match(/android/gi);
var isIPhone = win.navigator.appVersion.match(/iphone/gi);
var devicePixelRatio = win.devicePixelRatio;
Expand All @@ -52,9 +56,11 @@
}

docEl.setAttribute('data-dpr', dpr);
if (!metaEl) {
metaEl = doc.createElement('meta');
metaEl.setAttribute('name', 'viewport');
if (!initialScale) {
if (!metaEl) {
metaEl = doc.createElement('meta');
metaEl.setAttribute('name', 'viewport');
}
metaEl.setAttribute('content', 'initial-scale=' + scale + ', maximum-scale=' + scale + ', minimum-scale=' + scale + ', user-scalable=no');
if (docEl.firstElementChild) {
docEl.firstElementChild.appendChild(metaEl);
Expand All @@ -64,6 +70,7 @@
doc.write(wrap.innerHTML);
}
}


function refreshRem(){
var width = docEl.getBoundingClientRect().width;
Expand Down Expand Up @@ -114,4 +121,4 @@
return val;
}

})(window, window['lib'] || (window['lib'] = {}));
})(window, window['lib'] || (window['lib'] = {}));