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.

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

Made a handful of changes and a couple of bug fixes #116

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open

Made a handful of changes and a couple of bug fixes #116

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
41b66f3
Version 2.0.0 / Merge remote-tracking branch 'origin/dev'
pickhardt Aug 6, 2013
94ee981
Version 2.0.0 / Merge remote-tracking branch 'origin/dev'
pickhardt Aug 6, 2013
086eee9
move component.json to bower.json
aub Dec 2, 2013
bcd9602
Merge pull request #111 from aub/master
pickhardt Feb 6, 2014
2c9adf2
Reduce places where the _guiders array is accessed directly by callin…
majorcode Feb 19, 2014
5857084
If next() is called on a guider that should be skipped, the return va…
majorcode Feb 19, 2014
a8e2c78
Use a counter instead of a random number to automatically assign guid…
majorcode Feb 19, 2014
c9b5775
Check for myGuider === null in _attach since typeof null is 'object'.
majorcode Feb 19, 2014
b9a5ce2
When adding a guider after another and setting its prev ID, reciproca…
majorcode Feb 19, 2014
774fad6
Add events to observe guider prev/next navigation.
majorcode Feb 19, 2014
ae0d90a
Since we de-highlight guider.highlight, we should be highlighting it …
majorcode Feb 19, 2014
349bbd5
Reset _currentGuiderID to null when all guiders are hidden.
majorcode Feb 19, 2014
db7545c
Replace _dehighlightElement() with _removeHighlight() and call it in …
majorcode Feb 19, 2014
576d571
Add descriptions for guider options that were not listed in the doc.
majorcode Feb 19, 2014
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
Prev Previous commit
Next Next commit
Replace _dehighlightElement() with _removeHighlight() and call it in … 
…key places.

Note that hideAll() was often called before _dehighlightElement(). So it makes sense to ensure that the highlight is cleared in hideAll(). I also remove the highlight before setting the next one, and in the top of show().
  • Loading branch information
@majorcode
majorcode committed Feb 19, 2014
commit db7545c38ccc44919f6504b4708de001c583eb3e
22 changes: 8 additions & 14 deletions guiders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,18 +258,19 @@ var guiders = (function($) {
return myGuider;
};

guiders._dehighlightElement = function(selector) {
$(selector).removeClass('guiders_highlight');
};

guiders._hideOverlay = function() {
$("#guiders_overlay").fadeOut("fast");
};

guiders._highlightElement = function(selector) {
guiders._removeHighlight();
$(selector).addClass('guiders_highlight');
};

guiders._removeHighlight = function () {
$(".guiders_highlight").removeClass('guiders_highlight');
};

guiders._initializeOverlay = function() {
if ($("#guiders_overlay").length === 0) {
$("<div id='guiders_overlay'></div>").hide().appendTo("body");
Expand Down Expand Up @@ -482,6 +483,7 @@ var guiders = (function($) {

guiders.hideAll = function(omitHidingOverlay, next) {
next = next || false;
guiders._removeHighlight();

$(".guider:visible").each(function(index, elem){
var myGuider = guiders.get($(elem).attr('id'));
Expand All @@ -490,10 +492,6 @@ var guiders = (function($) {
}
});
$(".guider").fadeOut("fast");
var currentGuider = guiders.getCurrentGuider();
if (currentGuider && currentGuider.highlight) {
guiders._dehighlightElement(currentGuider.highlight);
}
if (typeof omitHidingOverlay !== "undefined" && omitHidingOverlay === true) {
// do nothing for now
} else {
Expand All @@ -516,9 +514,6 @@ var guiders = (function($) {
var nextGuider = guiders.get(nextGuiderId);
var omitHidingOverlay = nextGuider.overlay ? true : false;
guiders.hideAll(omitHidingOverlay, true);
if (currentGuider && currentGuider.highlight) {
guiders._dehighlightElement(currentGuider.highlight);
}

if (nextGuider.shouldSkip && nextGuider.shouldSkip()) {
guiders._currentGuiderID = nextGuider.id;
Expand Down Expand Up @@ -554,9 +549,6 @@ var guiders = (function($) {
var myGuider = guiders.get(prevGuiderId);
var omitHidingOverlay = myGuider.overlay ? true : false;
guiders.hideAll(omitHidingOverlay, true);
if (prevGuider && prevGuider.highlight) {
guiders._dehighlightElement(prevGuider.highlight);
}

// Trigger before show to allow observers to change the
// DOM before the new guider calculates its position
Expand Down Expand Up @@ -594,6 +586,8 @@ var guiders = (function($) {
}

var myGuider = guiders.get(id);
guiders._removeHighlight();

if (myGuider.overlay) {
guiders._showOverlay(myGuider);
// if guider is attached to an element, make sure it's visible
Expand Down