Merge branch 'master' of https://github.com/mozilla/brackets into issue-368-mozilla#2

Author: Th30

CONTRIBUTING.md

@@ -121,12 +121,3 @@ code contributions, reviewing pull requests, and providing feedback and suggesti
 direction of the project.
 
 Even if you're not a committer, you're still welcome to give feedback on any pull request!
-
-## Adding New Files
-
-When run in production (i.e., the resulting `dist/` dir from running `grunt build-browser-compressed`),
-Bramble uses a Service Worker to cache and serve the app offline.  In order to do this, the
-`swPrecache` grunt task generates a Service Worker ready to cache and serve all the necessary
-files.  This file list is generated statically at build time based on the contents of the
-`sw-cache-file-list.json` file.  If you add new files (e.g., a new default extension), make sure
-you add URL entries to this cache list.

Gruntfile.js

@@ -49,7 +49,7 @@ module.exports = function (grunt) {
     grunt.loadTasks('tasks');
 
     // Project configuration.
-    grunt.initConfig({
+    var config = {
         pkg  : grunt.file.readJSON("package.json"),
         clean: {
             dist: {
@@ -71,33 +71,10 @@ module.exports = function (grunt) {
             dist: {
                 files: [{
                     expand: true,
-                    cwd: 'src/',
-                    src: [
-                        /* static files */
-                        'xorigin.js',
-                        'dependencies.js',
-
-                        /* extensions and CodeMirror modes */
-                        '!extensions/default/*/unittests.js',
-                        'extensions/default/*/**/*.js',
-                        '!extensions/extra/*/unittests.js',
-                        'extensions/extra/*/**/*.js',
-                        '!extensions/**/node_modules/**/*.js',
-                        '!extensions/**/test/**/*.js',
-                        '!**/unittest-files/**',
-                        'thirdparty/i18n/*.js',
-                        'thirdparty/text/*.js'
-                    ],
+                    cwd: 'dist/',
+                    src: '**/*.js',
                     dest: 'dist/'
                 }]
-            },
-            nls: {
-                files: [{
-                    expand: true,
-                    cwd: 'dist/nls',
-                    src: [ '**/*.js' ],
-                    dest: 'dist/nls'
-                }]
             }
         },
         copy: {
@@ -128,37 +105,23 @@ module.exports = function (grunt) {
                         dest: 'dist/',
                         cwd: 'src/',
                         src: [
-                            'extensions/default/**/*',
-                            'extensions/extra/**/*',
                             '!extensibility/node/spec/**',
                             '!extensibility/node/node_modules/**/{test,tst}/**/*',
                             '!extensibility/node/node_modules/**/examples/**/*',
                             '!filesystem/impls/appshell/**/*',
-                            '!extensions/default/*/unittest-files/**/*',
-                            '!extensions/default/*/unittests.js',
-                            '!extensions/default/{*/thirdparty,**/node_modules}/**/test/**/*',
-                            '!extensions/default/{*/thirdparty,**/node_modules}/**/doc/**/*',
-                            '!extensions/default/{*/thirdparty,**/node_modules}/**/examples/**/*',
-                            '!extensions/default/*/thirdparty/**/*.htm{,l}',
-                            '!extensions/extra/*/unittest-files/**/*',
-                            '!extensions/extra/*/unittests.js',
-                            '!extensions/extra/{*/thirdparty,**/node_modules}/**/test/**/*',
-                            '!extensions/extra/{*/thirdparty,**/node_modules}/**/doc/**/*',
-                            '!extensions/extra/{*/thirdparty,**/node_modules}/**/examples/**/*',
-                            '!extensions/extra/*/thirdparty/**/*.htm{,l}',
-                            '!extensions/dev/*',
-                            '!extensions/samples/**/*',
+                            // We deal with extensions dynamically below in build-extensions
+                            '!extensions/**/*',
                             'thirdparty/CodeMirror/lib/codemirror.css',
                             'thirdparty/i18n/*.js',
                             'thirdparty/text/*.js'
                         ]
                     },
-                    /* styles, fonts and images */
+                    /* styles, fonts and images - XXXBramble: we skip the fonts */
                     {
                         expand: true,
                         dest: 'dist/styles',
                         cwd: 'src/styles',
-                        src: ['jsTreeTheme.css', 'fonts/{,*/}*.*', 'images/*', 'brackets.min.css*', 'bramble_overrides.css']
+                        src: ['jsTreeTheme.css', 'images/**/*', 'brackets.min.css*', 'bramble_overrides.css']
                     }
                 ]
             },
@@ -418,6 +381,16 @@ module.exports = function (grunt) {
                 cwd: 'dist/',
                 src: ['**/*'],
                 dest: 'dist/'
+            },
+            // We need to compress the bramble-sw.js service worker file after compressing dist/
+            sw: {
+                options: {
+                    mode: "gzip"
+                },
+                expand: true,
+                cwd: 'dist/',
+                src: 'bramble-sw.js',
+                dest: 'dist'
             }
         },
 
@@ -432,19 +405,80 @@ module.exports = function (grunt) {
                 rootDir: 'dist'
             }
         }
-    });
+    };
+
+    // Dynamically add requirejs and copy configs for all extensions
+    function configureExtensions(config) {
+        var extensions = grunt.file.readJSON("src/extensions/bramble-extensions.json");
+
+        // Write a requirejs config for each included extension
+        extensions.forEach(function(extension) {
+            config.requirejs[extension.path] = {
+                options: {
+                    name: 'main',
+                    baseUrl: 'src/' + extension.path,
+                    paths: {
+                        'text' : '../../../thirdparty/text/text',
+                        'i18n' : '../../../thirdparty/i18n/i18n'
+                    },
+                    optimize: 'uglify2',
+                    preserveLicenseComments: false,
+                    useStrict: true,
+                    uglify2: {},
+                    out: 'dist/' + extension.path + '/main.js'
+                }
+            };
+        });
+
+        // Also copy each extension's files across to dist/
+        var extensionGlobs = [];
+        extensions.forEach(function(extension) {
+            // First, copy the dir itself.  The main.js will get built below.
+            extensionGlobs.push(extension.path.replace(/\/?$/, "/"));
+
+            // If there are any globs defined for extra paths to copy, add those too.
+            if(extension.copy) {
+                extensionGlobs = extensionGlobs.concat(extension.copy);
+            }
+        });
+
+        config.copy.dist.files.push({
+            expand: true,
+            dest: 'dist/',
+            cwd: 'src/',
+            src: extensionGlobs
+        });
+
+        // Add a task for building all requirejs bundles for each extension
+        var tasks = extensions.map(function(extension) {
+            return 'requirejs:' + extension.path;
+        });
+        grunt.registerTask('build-extensions', tasks);
+
+        return config;
+    }
+
+    grunt.initConfig(configureExtensions(config));
 
     grunt.registerMultiTask('swPrecache', function() {
         var done = this.async();
         var rootDir = this.data.rootDir;
-        var files =  (function() {
-            return (require('./sw-cache-file-list.json')).files;
-        }());
 
         var config = {
             cacheId: 'bramble',
             logger: grunt.log.writeln,
-            staticFileGlobs: files,
+            staticFileGlobs: [
+                // Avoid caching dist/nls/**/*, but take everything else in dist/
+                'dist/{extensions,styles,thirdparty}/**/*',
+                'dist/*.*'
+            ],
+            runtimeCaching: [{
+                urlPattern: /^https:\/\/fonts\.googleapis\.com\/css/,
+                handler: 'fastest'
+            }, {
+                urlPattern: /\/dist\/nls\//,
+                handler: 'fastest'
+            }],
             stripPrefix: 'dist/',
             ignoreUrlParametersMatching: [/./]
         };
@@ -496,14 +530,16 @@ module.exports = function (grunt) {
         'build',
         'requirejs:iframe',
         'exec:localize-dist',
+        'build-extensions',
         'uglify'
     ]);
 
     // task: build dist/ for browser, pre-compressed with gzip and SW precache
     grunt.registerTask('build-browser-compressed', [
         'build-browser',
-        'compress',
-        'swPrecache'
+        'compress:dist',
+        'swPrecache',
+        'compress:sw'
     ]);
 
     // task: undo changes to the src/nls directory

README.md

@@ -72,53 +72,12 @@ should host Bramble's iframe, see `src/hosted.js`.
 
 **NOTE 3:** To use Bramble in a production setting locally, you can run `npm run production` and access Bramble at [http://localhost:8000/dist](http://localhost:8000/dist)
 
-# Optional Extension Loading
-
-Bramble supports enabling and disabling various extensions via the URL and query params.
-A standard set of default extensions are always turned on:
-
-* CSSCodeHints
-* HTMLCodeHints
-* JavaScriptCodeHints
-* InlineColorEditor
-* JavaScriptQuickEdit
-* QuickOpenCSS
-* QuickOpenHTML
-* QuickOpenJavaScript
-* QuickView
-* UrlCodeHints
-* brackets-paste-and-indent
-* BrambleUrlCodeHints
-* Autosave
-* UploadFiles
-* WebPlatformDocs
-* CodeFolding
-* bramble-move-file
-
-You could disable QuickView and CSSCodeHints by loading Bramble with `?disableExtensions=QuickView,CSSCodeHints`
-on the URL.
-
-In addition, you can enable other extra extensions:
-
-* SVGCodeHints
-* HtmlEntityCodeHints
-* LESSSupport
-* CloseOthers
-* InlineTimingFunctionEditor
-* JSLint
-* QuickOpenCSS
-* RecentProjects
-* brackets-cdn-suggestions
-* HTMLHinter
-* MdnDocs
-* SVGasXML
-
-You could enable JSLint and LESSSupport by loading Bramble with `?enableExtensions=JSLint,LESSSupport`
-on the URL
-
-NOTE: you can combine `disableExtensions` and `enableExtensions` to mix loading/disabling extensions.
-You should check src/utils/BrambleExtensionLoader.js for the most up-to-date version of these
-extension lists.
+# Extension Loading
+
+Bramble loads a set of extensions defined in `src/extensions/bramble-extensions.json`. You can
+alter which extensions Bramble loads by adding or removing items from this list.  You can also
+temporarily disable extensions by using `?disableExtensions`. For example: to disable QuickView
+and CSSCodeHints, load Bramble with `?disableExtensions=QuickView,CSSCodeHints` on the URL.
 
 --------------
 
@@ -128,7 +87,7 @@ After you have everything setup, you can now run the server you chose in the roo
 
 # Bramble IFrame API
 
-Bramble is desinged to be run in an iframe, and the hosting web app to communicate with it
+Bramble is designed to be run in an iframe, and the hosting web app to communicate with it
 via `postMessage` and `MessageChannel`.  In order to simplify this, a convenience API exists
 for creating and managing the iframe, as well as providing JavaScript functions for interacting
 with the editor, preview, etc.
@@ -310,6 +269,8 @@ a number of read-only getters are available in order to access state information
 * `getTheme()` - returns the name of the current theme.
 * `getFontSize()` - returns the current font size as a string (e.g., `"12px"`).
 * `getWordWrap()` - returns the current word wrap setting as a `Boolean` (i.e., enabled or disabled).
+* `getAllowJavaScript()` - returns the current allow javascript setting as a `Boolean` (i.e., enabled or disabled).
+* `getAutocomplete()` - returns the current autocomplete settings as a `Boolean` (i.e., enabled or disabled).
 * `getAutoCloseTags()` - returns the current close tags setting as an `Object` with three properties: `whenOpening` a boolean that determines whether opening tags are closed upon typing ">", `whenClosing` a boolean that determines whether closing tags are closed upon typing "/", and an array of tags `indentTags`, that when opened, has a blank line. These values default to, respectively: `true`, `true`, and an empty array.
 * `getTutorialExists()` - returns `true` or `false` depending on whether or not there is a tutorial in the project (i.e., if `tutorial.html` is present)
 * `getTutorialVisible()` - returns `true` or `false` depending on whether or not the preview browser is showing a tutorial or not.
@@ -327,7 +288,7 @@ to be notified when the action completes:
 * `undo([callback])` - undo the last operation in the editor (waits for focus)
 * `redo([callback])` - redo the last operation that was undone in the editor (waits for focus)
 * `increaseFontSize([callback])` - increases the editor's font size
-* `decreaseFontSize([callback])` - decreases the edtior's font size
+* `decreaseFontSize([callback])` - decreases the editor's font size
 * `restoreFontSize([callback])` - restores the editor's font size to normal
 * `save([callback])` - saves the current document
 * `saveAll([callback])` - saves all "dirty" documents
@@ -347,7 +308,7 @@ to be notified when the action completes:
 * `useMobilePreview([callback])` - uses a Mobile view in the preview, as it would look on a smartphone
 * `useDesktopPreview([callback])` - uses a Desktop view in the preview, as it would look on a desktop computer (default)
 * `enableFullscreenPreview([callback])` - shows a fullscreen preview of the current file
-* `disableFullscreenPreview([callback])` - turns off the fullscreen preview of the curent file
+* `disableFullscreenPreview([callback])` - turns off the fullscreen preview of the current file
 * `enableAutoUpdate([callback])` - turns on auto-update for the preview (default)
 * `disableAutoUpdate([callback])` - turns off auto-update for the preview (manual reloads still work)
 * `enableJavaScript([callback])` - turns on JavaScript execution for the preview (default)
@@ -370,13 +331,14 @@ to be notified when the action completes:
 The Bramble instance is also an [`EventEmitter`](https://github.com/Wolfy87/EventEmitter/) and raises
 the following events:
 
-* `"layout"` - triggered whenever the sidebar, editor, or preview panes are changed. It includes an `Object` that returns the same infor as the `getLayout()` getter: : `sidebarWidth`, `firstPaneWidth`, `secondPathWidth`
+* `"layout"` - triggered whenever the sidebar, editor, or preview panes are changed. It includes an `Object` that returns the same information as the `getLayout()` getter: : `sidebarWidth`, `firstPaneWidth`, `secondPathWidth`
 * `"activeEditorChange"` - triggered whenever the editor changes from one file to another. It includes an `Object` with the current file's `fullPath` and `filename`.
 * `"previewModeChange"` - triggered whenever the preview mode is changed. It includes an `Object` with the new `mode`
 * `"sidebarChange"` - triggered whenever the sidebar is hidden or shown. It includes an `Object` with a `visible` property set to `true` or `false`
-* `"themeChange"` - triggered whenever the theme changes. It inclues an `Object` with a `theme` property that indicates the new theme
+* `"themeChange"` - triggered whenever the theme changes. It includes an `Object` with a `theme` property that indicates the new theme
 * `"fontSizeChange"` - triggered whenever the font size changes. It includes an `Object` with a `fontSize` property that indicates the new size (e.g., `"12px"`).
 * `"wordWrapChange"` - triggered whenever the word wrap value changes. It includes an `Object` with a `wordWrap` property that indicates the new value (e.g., `true` or `false`).
+* `"allowJavaScriptChange"` - triggered whenever the allow javascript value changes. It includes an `Object` with a `allowJavaScript` property that indicates the new value (e.g., `true` or `false`).
 * `"autoCloseTagsChange"` - triggered whenever the close tag value changes. It includes an `Object` with a `autoCloseTags` property that indicates the new value
 * `"tutorialAdded"` - triggered when a new tutorial is added to the project
 * `"tutorialRemoved"` - triggered when an existing tutorial for the project is removed

locales/el/editor.properties

@@ -55,8 +55,11 @@ ERROR_MAX_FILES_TITLE=Σφάλμα ευρετηριοποίησης αρχείω
 
 EXT_MODIFIED_TITLE=Εξωτερικές αλλαγές
 # {0} will be replaced by a filename and {APP_NAME} will be replaced with the word "Brackets"
+EXT_MODIFIED_WARNING=Το <span class='dialog-filename'>{0}</span> έχει τροποποιηθεί στο δίσκο εκτός των {APP_NAME}.<br /><br />Θέλετε να αποθηκεύσετε το αρχείο και να αντικαταστήσετε αυτές τις αλλαγές;
 # {0} will be replaced by a filename and {APP_NAME} will be replaced with the word "Brackets"
+EXT_MODIFIED_MESSAGE=Το <span class='dialog-filename'>{0}</span> έχει τροποποιηθεί στο δίσκο εκτός των {APP_NAME}, αλλά έχει και μη αποθηκευμένες αλλαγές στο {APP_NAME}.<br /><br />Ποια έκδοση θέλετε να κρατήσετε;
 # {0} will be replaced by a filename and {APP_NAME} will be replaced with the word "Brackets"
+EXT_DELETED_MESSAGE=Το <span class='dialog-filename'>{0}</span> έχει διαγραφεί στο δίσκο εκτός των {APP_NAME}, αλλά έχει και μη αποθηκευμένες αλλαγές στο {APP_NAME}.<br /><br />Θέλετε να διατηρήσετε τις αλλαγές σας;
 
 
 #############
@@ -83,6 +86,10 @@ BUTTON_NO=Όχι
 # Quick Edit
 
 ERROR_QUICK_EDIT_PROVIDER_NOT_FOUND=Η Γρήγορη Επεξεργασία δεν είναι διαθέσιμη για την τρέχουσα θέση του κέρσορα
+ERROR_CSSQUICKEDIT_BETWEENCLASSES=Γρήγορη επεξεργασία CSS: τοποθετήστε τον κέρσορα σε ένα μόνο όνομα κατηγορίας
+ERROR_CSSQUICKEDIT_CLASSNOTFOUND=Γρήγορη επεξεργασία CSS: μη πλήρης ιδιότητα κατηγορίας
+ERROR_CSSQUICKEDIT_IDNOTFOUND=Γρήγορη επεξεργασία CSS: μη πλήρης ιδιότητα id
+ERROR_CSSQUICKEDIT_UNSUPPORTEDATTR=Γρήγορη επεξεργασία CSS: τοποθετήστε τον κέρσορα στην ετικέτα, την κατηγορία ή το id
 BUTTON_NEW_RULE=Νέος κανόνας
 
 # Quick Docs
@@ -103,6 +110,7 @@ CMD_TOGGLE_QUICK_DOCS=Γρήγορα έγγραφα
 
 # Drag and Drop
 
+DND_MAX_FILE_SIZE_EXCEEDED=το αρχείο ξεπερνά το μέγιστο υποστηριζόμενο μέγεθος: 3MB
 DND_UNSUPPORTED_FILE_TYPE=μη υποστηριζόμενος τύπος αρχείου
 DND_ERROR_UNZIP=αδυναμία αποσυμπίεσης αρχείου
 DND_ERROR_UNTAR=αδυναμία αποσυμπίεσης αρχείου .tar
@@ -163,4 +171,5 @@ PROJECT_ROOT=Ρίζα έργου
 PICK_A_FOLDER_TO_MOVE_TO=Επιλογή φακέλου
 ERROR_MOVING_FILE_DIALOG_HEADER=Σφάλμα μετακίνησης
 # {0} is the name of the file/folder being moved and {1} is the name of the folder it is being moved to
+UNEXPECTED_ERROR_MOVING_FILE=Προέκυψε απρόσμενο σφάλμα κατά την προσπάθεια μετακίνησης του {0} στο φάκελο "{1}"
 # {0} is the name of the file/folder being moved and {1} is the name of the folder it is being moved to

locales/en-US/editor.properties

@@ -136,6 +136,9 @@ DND_SUCCESS_UNZIP=Successfully unzipped <b>{0}</b>.
 # {0} will be replaced by a tar filename
 DND_SUCCESS_UNTAR=Successfully untarred <b>{0}</b>.
 
+# Image Viewer
+IMAGE_DIMENSIONS={0} (width) &times; {1} (height) pixels
+
 ################
 ## EXTENSIONS ##
 ################