Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Commit

Permalink
Merge pull request #24 from stagfoo/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
stagfoo committed Nov 20, 2017
2 parents ed93a48 + 41f26a2 commit e203d50
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 180 deletions.
2 changes: 1 addition & 1 deletion dist/fairybread.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

161 changes: 1 addition & 160 deletions docs/fairybread.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"name": "fairybread",
"version": "1.1.2",
"description": "a javascript utility to manage css and replace sass",
"version": "1.2.0",
"description": "a javascript utility to manage css and match sass functions",
"main": "dist/fairybread.min.js",
"scripts": {
"test": "jest",
"build": "webpack -p"
"build": "npm run test && uglifyjs src/fairybread.js -o docs/fairybread.min.js",
"new-release": "npm run test && uglifyjs src/fairybread.js -o docs/fairybread.min.js",
"docs": "npm run test && http-server docs/"
},
"repository": {
"type": "git",
Expand Down
19 changes: 4 additions & 15 deletions src/fairybread.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function Fairybread(sheetType) {
// Uniquish Id
this.id = makeId();
// Create Sheetsheet
function createSheet(id) {
this.createSheet = function (id) {
var styleNode = document.createElement('style');
styleNode.type = 'text/css';
styleNode.id = id;
Expand All @@ -37,7 +37,7 @@ function Fairybread(sheetType) {
return ruleSet;
}

this.sheet = createSheet(this.id);
this.sheet = this.createSheet(this.id);
this.specialSheet = false;
this.specialId = makeId() + "_special";
this.rendered = false;
Expand Down Expand Up @@ -124,17 +124,6 @@ Fairybread.prototype.addSpecial = function (rule) {
}
}
Fairybread.prototype.ensure = function (key, path) {
function bindSheet(node,location) {
document[location].appendChild(node);
}
function createSheet(id) {
var styleNode = document.createElement('style');
styleNode.type = 'text/css';
styleNode.id = id;
styleNode.rel = 'stylesheet';
// required for sheet attr to be created
return styleNode;
}
//check if this sheet has already ensured it
var sheetId = this.id;
var ensureList = this.ensureList;
Expand All @@ -145,9 +134,9 @@ Fairybread.prototype.ensure = function (key, path) {
allFbs.map(function (node, i) { if(node.id.indexOf(key) > -1){ exist = true; } })
if(exist === false){
var temp_id = sheetId+'_'+key;
var ensured = createSheet(temp_id);
var ensured = this.createSheet(temp_id);
ensured.innerHTML = '@import("'+path+'")';
bindSheet(ensured, 'head');
this.bindSheet(ensured, 'head');
ensureList[key] = true;
}
}
Expand Down

0 comments on commit e203d50

Please sign in to comment.