apostrophe-browser-support - npm Package Compare versions

Comparing version 0.5.4 to 0.5.5

index.js

 var fs = require('fs');
 
-module.exports = factory; 
+module.exports = factory;
 
@@ -10,6 +10,4 @@ function factory(options, callback) {
 	var self = this;
-
 	self._apos = options.apos;
 	self._app = options.app;
-
 	var blackList = options.blacklist;
@@ -19,26 +17,28 @@ var graylist = options.graylist;
 
-
 	self._apos.mixinModuleAssets(self, 'browser-support', __dirname, options);
 
-	fs.writeFileSync(__dirname + '/public/js/blacklist.js', 'window.blacklist = ' + JSON.stringify(blackList) + '; window.graylist = ' + JSON.stringify(graylist) + ';');
+	//Create a js file with the blacklist and graylist from options and make it available to the client before everything loads
+	fs.readFile(__dirname + '/public/js/browserdetect.js', 'utf8', function (err, data){
+		fs.writeFileSync(__dirname + '/public/js/browser-support.js', 'var blacklist = ' + JSON.stringify(blackList) + '; var graylist = ' + JSON.stringify(graylist) + ';' + data
+		);
+		//self.pushAsset ('script', 'blacklist', {when: 'always'});
+		self.pushAsset ('script', 'jquery.cookie', {when: 'always'});
+		self.pushAsset ('script', 'platform', {when: 'always'});
+		//self.pushAsset ('script', 'browserdetect', {when: 'always'});
+		self.pushAsset ('script', 'browser-support', { when: 'always'});
+		self.pushAsset ('stylesheet', 'modal-style', {when: 'always'});
+		self.pushAsset ('stylesheet', 'browser-support', {when: 'always'});
+		self.pushAsset ('template', 'modal', {when: 'always'});
 
-	self.pushAsset ('script', 'platform', {when: 'always'});
-	self.pushAsset ('script', 'blacklist', {when: 'always'});
-	self.pushAsset ('script', 'browserdetect', {when: 'always'});
-	self.pushAsset ('stylesheet', 'modal-style', {when: 'always'});
-	self.pushAsset ('stylesheet', 'browser-support', {when: 'always'});
-	self.pushAsset ('template', 'modal', {when: 'always'});
+		self._app.get('/apos-browser-support/old-browser', function(req, res){
+			return res.send(self.render('oldbrowser'));
+		});
 
-
-
-	self._app.get('/apos-browser-support/old-browser', function(req, res){
-		return res.send(self.render('oldbrowser'));
+		if (callback) {
+			return process.nextTick(function() {
+				return callback(null);
+			});
+		}
 	});
-
-	if (callback) {
-		return process.nextTick(function() {
-			return callback(null);
-		});
-	}
 }
-factory.Construct = Construct;
+factory.Construct = Construct;

package.json

 {
   "name": "apostrophe-browser-support",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Maintain the aesthetic of your website by restricting old browsers from seeing it.",
@@ -5,0 +5,0 @@ "main": "index.js",

public/js/browserdetect.js

@@ -1,5 +0,1 @@
-var blacklist = window.blacklist;
-var graylist = window.graylist;
-console.log(blacklist);
-console.log(graylist);
 for (var i = 0; i < blacklist.length; i++) {
@@ -12,3 +8,3 @@ var browser = blacklist[i].name.toLowerCase(),
 	if (ignoreOlder) {
-		if (browser == platform.name && parseFloat(platform.version) == version) {
+		if (browser == platformName && parseFloat(platform.version) == version) {
 			if (window.location.href != '/apos-browser-support/old-browser') {
@@ -19,3 +15,3 @@ window.location.href = '/apos-browser-support/old-browser';
 	} else {
-		if (browser == platform.name && parseFloat(platform.version) <= version) {
+		if (browser == platformName && parseFloat(platform.version) <= version) {
 			if (window.location.href != '/apos-browser-support/old-browser') {
@@ -27,21 +23,24 @@ window.location.href = '/apos-browser-support/old-browser';
 }
-for (var i = 0; i < graylist.length; i++) {
-	var browser = graylist[i].name.toLowerCase(),
-		version = graylist[i].version,
-		platformName = platform.name.toLowerCase(),
-		includeOlder = graylist[i].includeOlder;
-	console.log(includeOlder);
-	if (includeOlder) {
-		if (browser == platformName && parseFloat(platform.version) <= version) {
-			hideModal();
+if (!$.cookie('apostrophe-browser-support')) {
+	$.cookie('apostrophe-browser-support', true, { path: '/' });
+	for (var i = 0; i < graylist.length; i++) {
+		var browser = graylist[i].name.toLowerCase(),
+			version = graylist[i].version,
+			platformName = platform.name.toLowerCase(),
+			includeOlder = graylist[i].includeOlder;
+
+		if (includeOlder) {
+			if (browser == platformName && parseFloat(platform.version) <= version) {
+				showModal();
+			}
+		} else {
+			if (browser == platformName && version == parseFloat(platform.version)) {
+				showModal();
+			}	
 		}
-	} else {
-		if (browser == platformName && version == parseFloat(platform.version)) {
-			hideModal();
-		}	
 	}
-	
-}
+} 
 
-function hideModal() {
+
+function showModal() {
 	$(document).ready(function(){
@@ -53,2 +52,2 @@ $('.graylist-modal-outer').show();
 	});
-}
+}

README.md

@@ -60,2 +60,4 @@ #apostrophe-browser-support
 ```
+###Templates
 
+

No alert changes

Improved metrics

Total package byte prevSize

76579

increased by6.66%

Number of package files

13

increased by18.18%

Lines of code

1216

increased by13.43%

Number of lines in readme file

63

increased by3.28%

No dependency changes