Skip to content
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.

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

Remove jQuery dependency #28

Merged
merged 3 commits into from
Mar 26, 2014
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Medium.
Installation
------------

Add jQuery (1.8 or above), [nprogress.js] and [nprogress.css] to your project.
Add [nprogress.js] and [nprogress.css] to your project.

Basic usage
-----------
Expand Down
3 changes: 0 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"bar",
"spinner"
],
"dependencies": {
"jquery": "*"
},
"license": "MIT",
"main": "nprogress.js",
"scripts": [
Expand Down
224 changes: 190 additions & 34 deletions nprogress.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
;(function(factory) {

if (typeof module === 'function') {
module.exports = factory(this.jQuery || require('jquery'));
module.exports = factory();
} else if (typeof define === 'function' && define.amd) {
define(['jquery'], function($) {
return factory($);
define(function() {
return factory();
});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

define(factory);?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call 👍

} else {
this.NProgress = factory(this.jQuery);
this.NProgress = factory();
}

})(function($) {
})(function() {
var NProgress = {};

NProgress.version = '0.1.2';
Expand All @@ -27,6 +27,8 @@
trickleRate: 0.02,
trickleSpeed: 800,
showSpinner: true,
barSelector: '[role="bar"]',
spinnerSelector: '[role="spinner"]',
template: '<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
};

Expand All @@ -38,7 +40,12 @@
* });
*/
NProgress.configure = function(options) {
$.extend(Settings, options);
var key, value;
for (key in options) {
value = options[key];
if (value !== undefined && options.hasOwnProperty(key)) Settings[key] = value;
}

return this;
};

Expand All @@ -61,27 +68,33 @@
n = clamp(n, Settings.minimum, 1);
NProgress.status = (n === 1 ? null : n);

var $progress = NProgress.render(!started),
$bar = $progress.find('[role="bar"]'),
speed = Settings.speed,
ease = Settings.easing;
var progress = NProgress.render(!started),
bar = progress.querySelector(Settings.barSelector),
speed = Settings.speed,
ease = Settings.easing;

$progress[0].offsetWidth; /* Repaint */
progress.offsetWidth; /* Repaint */

$progress.queue(function(next) {
queue(function(next) {
// Set positionUsing if it hasn't already been set
if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();

// Add transition
$bar.css(barPositionCSS(n, speed, ease));
css(bar, barPositionCSS(n, speed, ease));

if (n === 1) {
// Fade out
$progress.css({ transition: 'none', opacity: 1 });
$progress[0].offsetWidth; /* Repaint */
css(progress, {
transition: 'none',
opacity: 1
});
progress.offsetWidth; /* Repaint */

setTimeout(function() {
$progress.css({ transition: 'all '+speed+'ms linear', opacity: 0 });
css(progress, {
transition: 'all ' + speed + 'ms linear',
opacity: 0
});
setTimeout(function() {
NProgress.remove();
next();
Expand Down Expand Up @@ -169,42 +182,48 @@
*/

NProgress.render = function(fromStart) {
if (NProgress.isRendered()) return $("#nprogress");
$('html').addClass('nprogress-busy');

var $el = $("<div id='nprogress'>")
.html(Settings.template);

var perc = fromStart ? '-100' : toBarPerc(NProgress.status || 0);

$el.find('[role="bar"]').css({
if (NProgress.isRendered()) return document.getElementById('nprogress');

addClass(document.documentElement, 'nprogress-busy');

var progress = document.createElement('div');
progress.id = 'nprogress';
progress.innerHTML = Settings.template;

var bar = progress.querySelector(Settings.barSelector),
perc = fromStart ? '-100' : toBarPerc(NProgress.status || 0),
spinner;

css(bar, {
transition: 'all 0 linear',
transform: 'translate3d('+perc+'%,0,0)'
transform: 'translate3d(' + perc + '%,0,0)'
});

if (!Settings.showSpinner)
$el.find('[role="spinner"]').remove();

$el.appendTo(document.body);
if (!Settings.showSpinner) {
spinner = progress.querySelector(Settings.spinnerSelector);
spinner && removeElement(spinner);
}

return $el;
document.body.appendChild(progress);
return progress;
};

/**
* Removes the element. Opposite of render().
*/

NProgress.remove = function() {
$('html').removeClass('nprogress-busy');
$('#nprogress').remove();
removeClass(document.documentElement, 'nprogress-busy');
var progress = document.getElementById('nprogress');
progress && removeElement(progress);
};

/**
* Checks if the progress bar is rendered.
*/

NProgress.isRendered = function() {
return ($("#nprogress").length > 0);
return !!document.getElementById('nprogress');
};

/**
Expand Down Expand Up @@ -274,6 +293,143 @@
return barCSS;
}

/**
* (Internal) Queues a function to be executed.
*/

var queue = (function() {
var pending = [];

function next() {
var fn = pending.shift();
if (fn) {
fn(next);
}
}

return function(fn) {
pending.push(fn);
if (pending.length == 1) next();
};
})();

/**
* (Internal) Applies css properties to an element, similar to the jQuery
* css method.
*
* While this helper does assist with vendor prefixed property names, it
* does not perform any manipulation of values prior to setting styles.
*/

var css = (function() {
var cssPrefixes = [ 'Webkit', 'O', 'Moz', 'ms' ],
cssProps = {};

function camelCase(string) {
return string.replace(/^-ms-/, 'ms-').replace(/-([\da-z])/gi, function(match, letter) {
return letter.toUpperCase();
});
}

function getVendorProp(name) {
var style = document.body.style;
if (name in style) return name;

var i = cssPrefixes.length,
capName = name.charAt(0).toUpperCase() + name.slice(1),
vendorName;
while (i--) {
vendorName = cssPrefixes[i] + capName;
if (vendorName in style) return vendorName;
}

return name;
}

function getStyleProp(name) {
name = camelCase(name);
return cssProps[name] || (cssProps[name] = getVendorProp(name));
}

function applyCss(element, prop, value) {
prop = getStyleProp(prop);
element.style[prop] = value;
}

return function(element, properties) {
var args = arguments,
prop,
value;

if (args.length == 2) {
for (prop in properties) {
value = properties[prop];
if (value !== undefined && properties.hasOwnProperty(prop)) applyCss(element, prop, value);
}
} else {
applyCss(element, args[1], args[2]);
}
}
})();

/**
* (Internal) Determines if an element or space separated list of class names contains a class name.
*/

function hasClass(element, name) {
var list = typeof element == 'string' ? element : classList(element);
return list.indexOf(' ' + name + ' ') >= 0;
}

/**
* (Internal) Adds a class to an element.
*/

function addClass(element, name) {
var oldList = classList(element),
newList = oldList + name;

if (hasClass(oldList, name)) return;

// Trim the opening space.
element.className = newList.substring(1);
}

/**
* (Internal) Removes a class from an element.
*/

function removeClass(element, name) {
var oldList = classList(element),
newList;

if (!hasClass(element, name)) return;

// Replace the class name.
newList = oldList.replace(' ' + name + ' ', ' ');

// Trim the opening and closing spaces.
element.className = newList.substring(1, newList.length - 1);
}

/**
* (Internal) Gets a space separated list of the class names on the element.
* The list is wrapped with a single space on each end to facilitate finding
* matches within the list.
*/

function classList(element) {
return (' ' + (element.className || '') + ' ').replace(/\s+/gi, ' ');
}

/**
* (Internal) Removes an element from the DOM.
*/

function removeElement(element) {
element && element.parentNode && element.parentNode.removeChild(element);
}

return NProgress;
});