Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

[ARCH] Updated bootstrap to 2.3.1 and less to 1.3.3 (needed for bootstrap) #3996

Closed
wants to merge 15 commits into from

Conversation

WebsiteDeveloper
Copy link
Contributor

@gruehle finally rebased correctly.
This supersedes #3672.

@TuckerWhitehouse
Copy link
Contributor

@WebsiteDeveloper modal windows seem to be broken. If I try to open Brackets > About or File > Extension Manager, I get the backdrop, but no modal window... and then brackets goes into a sort of broken state where none of the menu commands word, and I have to force close it. No errors in the dev console.

Mac OS X 10.8.3

@WebsiteDeveloper
Copy link
Contributor Author

i already saw that myself, it seems that this is related to the dialog animations.
will put up a fix.

@WebsiteDeveloper
Copy link
Contributor Author

@TuckerWhitehouse pushed a fix.
I would appreciate it if you would test the branch a bit more and notify me about anything you notice.

@TuckerWhitehouse
Copy link
Contributor

@WebsiteDeveloper looks good!
Using it to test right now and everything seems to be working without issue. I'll let you know if I find anything.

@@ -41,7 +41,7 @@ define(function (require, exports, module) {
var inlineEditorTemplate = require("text!InlineDocsViewer.html");

// Load CSS
ExtensionUtils.loadStyleSheet(module, "WebPlatformDocs.less");
Copy link
Member

Choose a reason for hiding this comment

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

Why was this changed from .less to .css? ExtensionUtils.loadStyleSheet() needs to support loading css or less files.

Copy link
Contributor

Choose a reason for hiding this comment

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

@gruehle ExtensionUtils.loadStyleSheet() does support both css and less files (unless something broke).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

its actually not a problem with the function, but with the way less is interpreting the file path of certain urls.
Those urls weren't loaded properly because they did point to an nonexistent file after being processed bei less.
This seems due to a change in Less which changes the handling of relative urls.
I tried finding another workaround but didn't find one for now.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, the url rewriting rules changed in less 1.3.2. Adding rootpath: dir to the options structure on line 88 of ExtentionUtils.js solves the problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well thanks, didn't find that out will fix it when i push a bunch of fixes.

@gruehle
Copy link
Member

gruehle commented May 28, 2013

Found another one that needs updating: alert-message should be alert. This is used in the find bar, project settings dialog, and a couple extension dialogs.

@gruehle
Copy link
Member

gruehle commented May 28, 2013

And one more: Twipsy. Live Development shows a twipsy when the connection has been severed. Twipsy has been renamed Tooltip, so the live dev code needs to be updated, and src/widgets/bootstrap-twipsy-mod.js should be removed.

@njx
Copy link
Contributor

njx commented May 28, 2013

@DennisKehrig made a number of modifications to Twipsy to deal with our use case. Those would need to be ported to the new version.

@@ -7,6 +7,6 @@ <h1 class="dialog-title">{{EXTENSION_MANAGER_TITLE}}</h1>
<div class="modal-body no-padding zebra-striped"></div>
Copy link
Member

Choose a reason for hiding this comment

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

This zebra-striped should be table-striped

@dangoor
Copy link
Contributor

dangoor commented May 30, 2013

@WebsiteDeveloper Thanks for all of the work on getting LESS and Bootstrap updated!

@TuckerWhitehouse and I have been working on the jQuery 2.0 update. We really want to get all of these upgraded packages on master as early as we can to get the most testing on it that we can. To that end, I've put up a branch that has everything integrated (including this pull request):

https://github.com/adobe/brackets/tree/jQueryLESSBootstrap

Brackets doesn't boot on that branch because of Twipsy (fails on $.browser, which is gone).

@WebsiteDeveloper how are your latest fixes coming? I can help out if there's something you haven't gotten to yet, and Glenn will be back around tomorrow. Ideally, we'd merge jQueryLESSBootstrap to master tomorrow.

Thanks again! Getting all of these upgrades in this sprint will be great.

@WebsiteDeveloper
Copy link
Contributor Author

@dangoor all fixes except the replacement of the twipsy plugin should be done.

@WebsiteDeveloper
Copy link
Contributor Author

Is there a good way too test the appearance and the behavior of the twipsy?
So i can try to replace it with the tooltip.

@gruehle
Copy link
Member

gruehle commented May 30, 2013

@WebsiteDeveloper - the easiest way to see the twipsy is to start live development and then show dev tools on the opened page. You will see a twipsy pointing to the live development lightning bolt.

For reference, #2178 is the pull request where twipsy was added (and modified).

@WebsiteDeveloper
Copy link
Contributor Author

@dangoor i would appreciate a bit help with the tooltip, because i currently don't have the time to digg into it.

@dangoor
Copy link
Contributor

dangoor commented May 31, 2013

@WebsiteDeveloper I've taken a bit of a look. Unfortunately, our changes to twipsy don't cleanly apply to the tooltip. If @gruehle doesn't get to it today, I can take a look Monday morning.

Making the tooltip work properly appears to be the big thing keeping the jQueryLESSBootstrap branch from working reasonably well (possibly well enough to merge for testing to begin)

@njx
Copy link
Contributor

njx commented May 31, 2013

@DennisKehrig made the original twipsy mods - Dennis, would you have any time to help out with migrating it to Bootstrap 2?

@DennisKehrig
Copy link
Contributor

@njx Not for at least another week, sadly!

@njx
Copy link
Contributor

njx commented May 31, 2013

No prob, we'll figure it out :)

@gruehle
Copy link
Member

gruehle commented May 31, 2013

I pushed a fix to the jQueryLESSBootstrap branch. The fix updates the bootstrap-twipsy-mod.js file to use tooltip classes instead of twipsy classes, and makes the code work with jQuery 2.0. This seems simpler than trying to wrestle with Bootstrap tooltip code.

@WebsiteDeveloper
Copy link
Contributor Author

@gruehle i agree it makes a lot easiery fix.
Maybe i'll look into modifying the tooltip code in a week or so, when i have a bunch more time to spend.

@gruehle
Copy link
Member

gruehle commented Jun 2, 2013

@WebsiteDeveloper - I put up pull request #4054, which supersedes this pull request. It has all of your commits here, plus an upgrade to jQuery 2.0.1. Thanks again for all of your help with this!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants