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

Live development #1286

Merged
merged 1,568 commits into from
Jul 26, 2012
Merged

Live development #1286

merged 1,568 commits into from
Jul 26, 2012

Conversation

jdiehl
Copy link
Contributor

@jdiehl jdiehl commented Jul 20, 2012

Updated to latest brackets/master
Enabled all live-development features

This pull request includes language switching

jasonsanjose and others added 30 commits June 20, 2012 17:29
Maintain focus in editor when clicking working set. Fixes #1081
Nice fix! Looks good. Merging.
Resolve loadStyleSheet with the created link element
…take2

* origin/master:
  now that the working set view handles mousedown instead of click in order to capture left and right clicks, it's necessary to call preventDefault() so the focus is not removed from the editor.
  remove high ascii file
  fix typo
  git munged high ascii in file name, so use only low ascii
  Fix typo
  Update ExtensionLoader require paths to include text plugin. Update InlineImageViewer to use text plugin to load an HTML template.
  Correct showInlineEditor to toggleQuickEdit. Updated all references and ran unit tests.
  Fix SHOW_INLINE_EDITOR command handler to return a promise.
  Clean up Debug menu (issues #977, #1056): - Move JSLint to View menu; Use Tabs to Edit menu - Remove "Experimental" heading - Remove "Close Browsers" command (after discussion w/ Glenn) - underlying NativeApp API not removed since it's still used by unit tests - Reorder remaining Debug menu items - Rename "Reload Window"->"Reload Brackets" for clarity - Rename "New Window"->"New Brackets Window" for clarity - Move JSLint command impl to JSLintUtils - (Left Use Tabs impl in DebugCommandHandlers for now until it has a more natural home)
  Add unit tests for filtering out token types in JavaScript Quick Edit.
  initial set of tests complete
  intermediate checkin for first unit test
  RequireJS text plugin 1.0.8

Conflicts:
	src/extensions/default/JavaScriptQuickEdit/unittests.js
…take2

* origin/master:
  fix JSLint warning
  add New command back to project context menu
  Fix issues Jason raised in code review.
  don't toggle open folders on right-click
  Code review
  Provide Indent/Unindent in Edit menu.
  close menus on scroll
  Resolve loadStyleSheet with the created link element
  select tree node on right-click
@joelrbrandt
Copy link
Contributor

Thanks for submitting this! I'll work with the team to get this reviewed during the next Sprint (starting Tues, July 24)

@ghost ghost assigned joelrbrandt Jul 21, 2012
peterflynn and others added 4 commits July 22, 2012 14:20
- Only warn on missing relativeID if 'position' requires a relativeID
Other minor cleanups:
- Add warning if relativeID is a section marker is but 'position' is not
  section-relative
- Remove unused $sectionItems var
- Add TODO about simpifying part of _getRelativeMenuItem()
Fix issue #1292 (Lots of menu-related console spam)
@jdiehl
Copy link
Contributor Author

jdiehl commented Jul 24, 2012

This pull request now includes sprint 11

@joelrbrandt
Copy link
Contributor

@jdiehl I reviewed this and it looks good to merge. Thanks for updating this.

However, the language switching / localization stuff (from #1285) is in this pull request as well. Can you remove that from this pull request?

btw, thanks for providing the German translation! The plan for Monday's architecture meeting is to discuss how we'll do language switching, taking into account your proposal. But, if we go a slightly different path with how we do the loading, it will be confusing to have a different version of language switching in this branch.

Thanks!

@jdiehl
Copy link
Contributor Author

jdiehl commented Jul 26, 2012

Removed the localization stuff

@joelrbrandt
Copy link
Contributor

Looks great, merging! Thanks for doing this.

(Actually, there's a JSLint error at line 140 in LiveDevelopment.js, but I'll fix that since we're not working in master anyway.)

joelrbrandt added a commit that referenced this pull request Jul 26, 2012
Update Live Development branch to master.
@joelrbrandt joelrbrandt merged commit acda640 into adobe:live-development Jul 26, 2012
@jdiehl
Copy link
Contributor Author

jdiehl commented Jul 26, 2012

remove the "throw" statement

  • jonathan

On 26.07.2012, at 23:05, Joel Brandt reply@reply.github.com wrote:

Looks great, merging! Thanks for doing this.

(Actually, there's a JSLint error at line 140 in LiveDevelopment.js, but I'll fix that since we're not working in master anyway.)


Reply to this email directly or view it on GitHub:
#1286 (comment)

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

Successfully merging this pull request may close these issues.