From 598fc92c2ddea3eafe8338d7e1ae96c9ba8580ec Mon Sep 17 00:00:00 2001
From: Stefan Hasenstab
Date: Tue, 8 Jul 2014 15:56:33 +0200
Subject: [PATCH 01/12] sanitize hex colors by prefixing missing # if necessary
---
public/js/lib/models/arrow.js | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/public/js/lib/models/arrow.js b/public/js/lib/models/arrow.js
index aced0c3..4ba0d95 100644
--- a/public/js/lib/models/arrow.js
+++ b/public/js/lib/models/arrow.js
@@ -69,10 +69,15 @@ if (!('CSSArrowPlease' in window)) window.CSSArrowPlease = {};
hasBorder = borderWidth > 0,
css = '.arrow_box {\n';
+ color = this._sanitizeHexColors(color);
+
css += '\tposition: relative;\n';
css += '\tbackground: ' + color + ';\n';
- if (hasBorder) css += '\tborder: ' + borderWidth + 'px solid ' + borderColor + ';\n';
+ if (hasBorder) {
+ borderColor = this._sanitizeHexColors(borderColor);
+ css += '\tborder: ' + borderWidth + 'px solid ' + borderColor + ';\n';
+ }
css += '}\n';
css += '.arrow_box:after';
@@ -111,6 +116,7 @@ if (!('CSSArrowPlease' in window)) window.CSSArrowPlease = {};
@protected
**/
_arrowCSS: function (color, size, layer) {
+ color = this._sanitizeHexColors(color);
var pos = this.get('position'),
iPos = this.invertedPosition(),
rgbColor = this.hexToRGB(color),
@@ -204,6 +210,16 @@ if (!('CSSArrowPlease' in window)) window.CSSArrowPlease = {};
this._attributes = attributes;
},
+ /**
+ @method _sanitizeHexColors
+ @description prefix hexcolors with # if necessary
+ @returns {String} h
+ @protected
+ **/
+ _sanitizeHexColors: function(h) {
+ return (h.charAt(0)==='#')?h:'#' + h;
+ },
+
/**
@method getAttrs
@description returns all the attributes
From a77d696e923b44040675498fbbb542fe3a73e974 Mon Sep 17 00:00:00 2001
From: Stefan Hasenstab
Date: Mon, 14 Jul 2014 10:16:11 +0200
Subject: [PATCH 02/12] changed code indention to 2 spaces
---
public/js/lib/models/arrow.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/js/lib/models/arrow.js b/public/js/lib/models/arrow.js
index 4ba0d95..a23af2c 100644
--- a/public/js/lib/models/arrow.js
+++ b/public/js/lib/models/arrow.js
@@ -75,8 +75,8 @@ if (!('CSSArrowPlease' in window)) window.CSSArrowPlease = {};
css += '\tbackground: ' + color + ';\n';
if (hasBorder) {
- borderColor = this._sanitizeHexColors(borderColor);
- css += '\tborder: ' + borderWidth + 'px solid ' + borderColor + ';\n';
+ borderColor = this._sanitizeHexColors(borderColor);
+ css += '\tborder: ' + borderWidth + 'px solid ' + borderColor + ';\n';
}
css += '}\n';
@@ -217,7 +217,7 @@ if (!('CSSArrowPlease' in window)) window.CSSArrowPlease = {};
@protected
**/
_sanitizeHexColors: function(h) {
- return (h.charAt(0)==='#')?h:'#' + h;
+ return (h.charAt(0)==='#')?h:'#' + h;
},
/**
From 486917ec0b11955f77ade992393816cfe3920303 Mon Sep 17 00:00:00 2001
From: Ryan McDermott
Date: Fri, 18 Jul 2014 17:56:25 -0500
Subject: [PATCH 03/12] Add SEO meta description
---
public/index.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/public/index.html b/public/index.html
index 413f523..4159f24 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,6 +3,7 @@
cssarrowplease
+
From 636e45e02c2db2f4626c61cc9dd0752592aa52ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=B8jberg?=
Date: Sat, 2 Aug 2014 10:26:10 -0700
Subject: [PATCH 04/12] simplify deploymeny and serving
---
.gitignore | 1 -
bin/server | 18 ------------------
package.json | 6 +-----
public/index.html | 2 +-
server.js | 10 ++++++++++
5 files changed, 12 insertions(+), 25 deletions(-)
delete mode 100644 bin/server
create mode 100644 server.js
diff --git a/.gitignore b/.gitignore
index b5b56cf..ac1e8f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
node_modules
-public-min
*.log
.DS_Store
diff --git a/bin/server b/bin/server
deleted file mode 100644
index f1ef1b5..0000000
--- a/bin/server
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-var connect = require('connect'),
- http = require('http'),
- port = process.env.PORT || 3000,
- static;
-
-if (process.argv.indexOf('--development') !== -1) {
- console.log('CSS Arrow Please in development on http://localhost:' + port);
- static = connect.static('public');
-}
-else {
- static = connect.static('public-min', {
- maxAge: 365 * 24 * 60 * 60 * 1000
- });
-}
-
-http.createServer( connect().use( static ) ).listen( port );
diff --git a/package.json b/package.json
index a47cfab..ebe8566 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
"email": "r.hackr@gmail.com"
},
"description": "Generate the CSS for a tooltip arrow",
- "main": "",
"repository": {
"type": "git",
"url": "git://github.com/hojberg/cssarrowplease.git"
@@ -17,14 +16,11 @@
],
"homepage": "http://cssarrowplease.com/",
"scripts": {
- "start": "node ./bin/server"
+ "start": "node ./server.js"
},
"dependencies": {
"connect": "~2.0.3"
},
- "devDependencies": {
- "assetgraph-builder": ">=0.2.37"
- },
"engines": {
"node": ">=0.6"
},
diff --git a/public/index.html b/public/index.html
index 4159f24..fa3c54c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -56,7 +56,7 @@ Arrow configuration
Arrow configuration
-
-
-
-
-
-
-
-
+