Merge sept 01 #583
Merged
Merge sept 01 #583
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… coordinates (delete area and screen transformation matrix) when a scroll happened. This is not done using a scroll handler since the update is expensive (getScreenCTM and getClientBoundingRect) and we don't need to do it until the scroll is done and the user is interacting with blocks again.
…enctm-bugs Fix for scratchfoundation#498. Recalculate the things that use screen coordinates (de…
…space factory (scratchfoundation#546) * Added pre-loaded blocks with import and export, squashed commit. * Configure Options object Allows user to configure the options object, see changes in the preview workspace, and export the options object (squashed commit). * Nit changes to style.css
* created FactoryUtils, to share useful generator code between the different apps within Blockly Factory * undo removal of alert upon empty block library nit removed specification of wfactory exporter param in comment for export controller * remove alert from index and nit comment in wfactory generator
Add a isMutator member similar to isFlyout to workspace_svg so it knows whether it is mutator or not. Allow blocks to access that property so that they can recalculate coordinates appropriately.
…tor-coord Fix for scratchfoundation#521.
…hfoundation#549) * Did cherry-picking for style changes with different resolution, no workspace factory style yet * Nit changes * Moving style out of index.html to factory.css * Nit ordering in factory.css
…#550) * added warning if a block type already exists in blockly standard category simplified isStandardBlockType * simplified code, removed isStandardBlockType function * nit remove implementation detail from comment
* Starting to integrate workspacefactory * Committing before switching branches * Tab for workspace factory working * Committing before switching branches * Refactored to have FactoryInit namespace and move logic out of AppController * Nit typo fix. * Fixed bugs from rebasing * Nit fix in factory.css * Added this. to previewWorkspace
* Changed all namespaces from 'Factory' to 'WorkspaceFactory' * Fixed brace problem in factory.js, syntax error in app_controller.js
…/variable_management Use a Blockly.Msg for button text
* generate category xml from block library and from imported block defs * simplified algorithms for parsing block definition and cleaned up style * refactored getCategoryFromBlockDefs, breaking it up and moving it to FactoryUtils * refactored getCategoryXml, fixed bug in updatingToolBox of exporter * removed unneeded function, added quick check for empty library * nit comments
* Updated tab in blockly factory to reflect changes made to workspace factory, changes mainly in index.html and wfactory_init.js * Added tab for workspace editing mode * Changed font size in dropdown menu * Added class for options inputs to add event listeners more easily
…nto feature/variable_management
…missing_require Require constants in workspaceSvg, which uses them during initialization
…ation#593) * Made workspace factory toolboxes take up height of screen, made workspce options properly scrollable, fixed being able to accidentally see Block factory some times, made Exporter and workspace factory scrollable if necessary * Nit alphabetize css rules * Fixed display none problems for Block factory, making it so that it can be hidden properly * Nit css style
…#594) working warnings on tab switches and create new block
…atchfoundation#589) * Fixed marking shadow blocks so keeps warnings when switching between categories * Done with variable and procedure block checks * Used setShadowDom instead of shadowDom_, and nit changes in wfactory init * Fixed bug of disable div covering whole screen
* Fixed bug of open flyout not updating by closing flyout, also changed shadow block editing UI to be a block that changes between add shadow and remove shadow * Removed unncessary CSS rule
* Some options stuff changed * Finished changes to options, including moving readonly to toop, fixing zoom errors, indenting suboptions, generating an options string, getting category options automatically, and making max blocks clearer, and having number inputs * Added null check and nit line length
…tarter Code (scratchfoundation#606) * Automatically generates flyout on switching to category * Fixed import blocks bugs * Made last set of UI changes and changes to starter code exporting * Combined if statements * Only add toolbox if not read only * Removed extra curly braces
* block library now dynamically updates buttons based on the current block open in block factory--whether or not it is saved, whether or not changes have been made, whether or not it's the starter block. update buttons rather than switching to new block on delete remove warning about updating block alert when creating new block with unsaved changes working warnings on tab switches and create new block green buttons indicate user can save or update block, red save button indicates that user cannot save the block ( but encourages user to click button) consistent button name on default added alert upon switching between blocks without saving nit comments, condensing if statements, removing extra code throw errors in sameBlockXml function of factory utils created wrapper function for warning user about unsaved changes and checking if they'd like to proceed cleaned up code for setSelected block * nit change to warning message on block type being one of core block types * nit helper text for exporter * nit comments and spacing
…ation#607) * warn user upon refreshing page and leaving page (by going to prev page or by exiting the window or tab) * alert upon leaving page ONLY when unsaved changes * nit remove log * no alert when on starter block, added clarifying comment
* fix bug with global self * cleaned up code, moved warn into block lib controller, check for starter block in FactoryUtils.savedBlockChanges
…tchfoundation#617) * Bug fix for adding variables and procedures categories with prompt, removed blocks from category name, check if unsaved changes in workspace factory before leave * Updated flags in clear all. Added more comments * Solved merge conflicts
|
Lots of these commit are to demos or translation. I'm not sure if you want the .npmrc. Notable changes in shared code: Missing one commit that we'll pick up when we merge master->develop again: google/blockly@0ee5d6f |
|
looks good and no problems found :) thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.