removing JQUERY, lost fade in and slow scrolling effects though

[gustvao]

hey I removed JQUERY on this PR although did not have enough time to add native angular fade-in effects and slow scrolling..

but it is a start, pretty sure someone could help with the rest...

tks

[britztopher]

@gustvao What do you think is broken with the scroll? I was planning on looking at it, as I like the idea of not adding jquery dependency within my AngularJS apps.

[gustvao]

slow scrolling was being done by jQuery, one must adapt that feature to an angular solution.

this is how it was being done

$('html,body').stop().animate();

now I am just using $window.scrollTo() property.

the screen still scrolls, abruptly though

[britztopher]

@gustvao Ok got fade in working, how do you want to do PR? I was thinking forking your repo, making new branch, submit PR, then you can merge it in to your master branch. Does that work? Just a simple commit changes the scss class. If its easier I can just email/post code for fade in. Let me know what works. Starting work on scroll is next on list.

[gustvao]

Nice Christopher!

forking my repo then submitting a PR should work fine

On 15/10/2014, at 17:33, Christopher Britz [email protected] wrote:

@gustvao https://github.com/gustvao Ok got fade in working, how do you
want to do PR? I was thinking forking your repo, making new branch, submit
PR, then you can merge it in to your master branch. Does that work? Just a
simple commit changes the scss class. If its easier I can just email/post
code for fade in. Let me know what works. Starting work on scroll is next
on list.

—
Reply to this email directly or view it on GitHub
#21 (comment).

[josephlimb]

Any update on removing jQuery?

[gustvao]

i've done a part of it.. now waiting for community help to finish the
remaining parts

On 2 December 2014 at 22:49, Joseph [email protected] wrote:

Any update on removing jQuery?

—
Reply to this email directly or view it on GitHub
#21 (comment).

[kylewelsby]

try rewriting them to use CSS via angular-aminate

[gustvao]

@kylewelsby great idea, pls contribute like I did and send me a PR at my forked repo so I can merge with this one

[kylewelsby]

@gustvao sure will.

[kisonay]

I've done some work on this and got smooth vertical scrolling added. Should I initiate a pull request?

[gustvao]

@kisonay, yes pls.. send a PR to my fork and I will update this one

[kisonay]

alright, want to do some more testing and then will initiate the PR

[kisonay]

@gustvao PR has been submitted.

[kisonay]

@gustvao was my code usable?

[booleanbetrayal]

@gustvao - could you please take a look at resolving this PR's conflicts, rebasing against master? I'll prioritize this PR for merge once the conflicts have been resolved.

[britztopher]

@booleanbetrayal what conflicts still exist?

[booleanbetrayal]

just merge conflicts ... @gustvao want to take a look?

[britztopher]

@gustvao I just did a PR to your master branch. I think you should pull that in and update this pr, as I did some work for fading in the tooltip using angular animations

[booleanbetrayal]

sounds sweet @britztopher / @gustvao ... would be nice to get that combined PR in

[gustvao]

I am waiting for @kisonay to resubmit his PR.. gustvao#2

[kisonay]

just updated my pull request for @gustvai so hopefully we are good now.

[gustvao]

guys I tried to rebase my fork with actual master but I couldnt manage to resolve all the conflicts and still make it work without JQUERY...

@booleanbetrayal dont you wanna take a look at this PR? I believe it will be easier for you to resolve the conflicts given that you wrote the script from scratch..

alternatively @kisonay I could give you write permission to my forked repo so you could help me rebase it

[gustvao]

btw, the master in my fork is working perfectly without JQUERY 🎉

@kisonay gave you push access to the fork

[britztopher]

@gustvao yeah, i just tried to merge it myself, and there are some changes that require knowledge of the directives since your fork was done pretty long ago. I almost want to say we make a branch off of this @DaftMonk's master in your fork then piece over our stuff on our branch, then have that be a pr. What say you?

[booleanbetrayal]

Sounds like a good plan to me. Just let me know when you all have something
that can be merged!

On Thu, Sep 17, 2015 at 1:48 PM, Christopher Britz <[email protected]

wrote:

@gustvao https://github.com/gustvao yeah, i just tried to merge it
myself, and there are some changes that require knowledge of the directives
since your fork was done pretty long ago. I almost want to say we make a
branch off of this master in your fork then piece over our stuff on our
master, then have that be a pr. What say you?

—
Reply to this email directly or view it on GitHub
#21 (comment).

[britztopher]

@gustvao I started what i suggested above. I made a new fork then started bringing over our changes. Im working on the branch no-jquery-manual-merge (found here https://github.com/BritzTownRiots/angular-tour/tree/no-jquery-manual-merge).

I basically have this working:

1. got tips coming up on demo but for some reason i cant use the tpls file because it cant find the ng-template when loading html, so i just put in my own template within script tag within index.html for now.
2. fadeIn, but all the time and not with flag
   Not working:
3. Smooth Scroll - @kisonay if you could help me with the smooth scroll part (already in tour.js just not working)
4. callbacks
5. backdrop

Let me know what you guys can do, so we dont walk on each others feet. Ill be trying to get the callbacks functionality working

[kisonay]

I won't be able to take a look at this until next week.

[britztopher]

@kisonay thats fine. Id rather you look at it then myself, since implemented it. Plus I am going to have some fun with these callbacks.

[gustvao]

hey @britztopher I think that is a good idea, sorry I couldnt reply earlier, I am on vacation and wont be able to contribute for the next few weeks..

my 2 cents here are that we should keep everything on one fork (I think it should be easier).. with that in mind I gave you @britztopher collaborator access to my fork so you could fork @booleanbetrayal masters in a new branch..

[britztopher]

@gustvao how do you fork into a new branch. Your master branch is already ahead/behind @booleanbetrayal master, so pulling the upstream master into your master branch will end in the merge we were trying to solve. Am I missing something here?

[gustvao]

i see @britztopher

yes, you would have to clone my fork, then
git checktou -b rebase
git remote add fork [email protected]:DaftMonk/angular-tour.git
git pull fork master
resolve the conflicts
merge the rebase branch to master
then initiate a PR to @booleanbetrayal master

this is how I tried to do, but I couldnt manage to resolve the conflicts

[britztopher]

@gustvao thats why i just created a new fork in a different repo that I just started pulling over our code manually, which i have almost working besides the new backdrop option when it tries to sets this using jquery:

angular.element('<div class="tour-backdrop"></div>').insertBefore('.tour-tip');

trying to find a way around this now.

[gustvao]

@britztopher gotcha... this part is on the html template right for the demo right?

why dont you hard code it into the HTML manually instead of using this jquery foreach workaround?

[kmgilbert100]

When is this getting merged?

[booleanbetrayal]

we still need to get those conflicts resolved one way or another. swamped atm ... am i right in saying the holdup is the insertBefore? lot of pure DOM API implementations for that functionality here: http://stackoverflow.com/questions/19315948/insert-html-before-element-in-javascript-without-jquery

[kylewelsby]

/close