From 675de9b498c5de64b62a961515480cd4c3a12e6c Mon Sep 17 00:00:00 2001 From: Prashant Agrawal Date: Wed, 4 Oct 2017 00:14:23 +0530 Subject: [PATCH 01/31] fixed z-index --- src/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/style.css b/src/style.css index aacafa2..7d34133 100644 --- a/src/style.css +++ b/src/style.css @@ -882,7 +882,7 @@ body > #demo-frame { } .console { background: var(--color-bg); - z-index: 1; /* bring above iframe */ + z-index: 5; /* bring above iframe */ position: absolute; bottom: 0; min-height: 80px; @@ -963,4 +963,4 @@ while the theme CSS file is loading */ color: #D1EDFF; } .cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; } -.cm-s-midnight .CodeMirror-activeline-background { background: #253540; } \ No newline at end of file +.cm-s-midnight .CodeMirror-activeline-background { background: #253540; } From afc98284b87bec49e2a26629cf950190b7346fdf Mon Sep 17 00:00:00 2001 From: Prashant Agrawal Date: Wed, 4 Oct 2017 11:53:46 +0530 Subject: [PATCH 02/31] handled scrollbar --- src/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style.css b/src/style.css index 7d34133..4752867 100644 --- a/src/style.css +++ b/src/style.css @@ -882,7 +882,7 @@ body > #demo-frame { } .console { background: var(--color-bg); - z-index: 5; /* bring above iframe */ + z-index: 6; /* bring above iframe */ position: absolute; bottom: 0; min-height: 80px; From 58f136d497dc3091314c0ef50aea90ca97c93278 Mon Sep 17 00:00:00 2001 From: May Kittens Devour Your Soul Date: Thu, 12 Oct 2017 14:57:01 +0200 Subject: [PATCH 03/31] Update library-list.js *updates bulma --- src/library-list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/library-list.js b/src/library-list.js index d58efc6..affc35d 100644 --- a/src/library-list.js +++ b/src/library-list.js @@ -104,7 +104,7 @@ window.cssLibs = [ type: 'css' }, { - url: 'https://cdnjs.cloudflare.com/ajax/libs/bulma/0.5.2/css/bulma.min.css', + url: 'https://cdnjs.cloudflare.com/ajax/libs/bulma/0.6.0/css/bulma.min.css', label: 'Bulma', type: 'css' }, From ba00871b88447556cd8b75a697d67973bd9164bb Mon Sep 17 00:00:00 2001 From: ADIL MAHMOOD Date: Fri, 13 Oct 2017 09:44:32 +0530 Subject: [PATCH 04/31] Corrected feture to' feature' Corrected a typo , changed feture to feature. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5150e8a..76a60e6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Web-Maker ![Build](https://travis-ci.org/chinchang/web-maker.svg?branch=master) * Works offline * Inbuilt Console * Save and load your creations -* Auto-save feture +* Auto-save feature * Code auto-completion * Easy addition of popular JS & CSS libraries * Import & Export all creations anytime, anywhere From 2a92079bf18d29ebccc7fc2685809ee0ab10e9c6 Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Mon, 2 Oct 2017 13:21:05 +0530 Subject: [PATCH 05/31] add doctype to preview html. fixes #204 --- src/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script.js b/src/script.js index 9dda11f..ee1b511 100644 --- a/src/script.js +++ b/src/script.js @@ -954,6 +954,7 @@ globalConsoleContainerEl ); }, ''); var contents = + '\n' + '\n\n' + '\n' + externalCss + From 508ce715b4c33995f6f7d394f3e6032f7b660b0b Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Mon, 2 Oct 2017 13:43:03 +0530 Subject: [PATCH 06/31] create declarative directive for modal triggers. --- src/index.html | 6 +++--- src/script.js | 32 +++++++++++++++----------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/index.html b/src/index.html index c002161..ae9cf92 100644 --- a/src/index.html +++ b/src/index.html @@ -49,7 +49,7 @@ Run - + Add library @@ -216,7 +216,7 @@ - + @@ -226,7 +226,7 @@ © Web Maker    - + diff --git a/src/script.js b/src/script.js index ee1b511..54c2bda 100644 --- a/src/script.js +++ b/src/script.js @@ -1,8 +1,8 @@ /* global trackEvent */ /* global layoutBtn1, layoutBtn2, layoutBtn3, helpModal, notificationsModal, addLibraryModal, -onboardModal, layoutBtn1, layoutBtn2, layoutBtn3, layoutBtn4, helpBtn, onboardModal, onboardModal, +onboardModal, layoutBtn1, layoutBtn2, layoutBtn3, layoutBtn4, onboardModal, onboardModal, addLibraryModal, addLibraryModal, notificationsBtn, notificationsModal, notificationsModal, -notificationsModal, notificationsBtn, codepenBtn, saveHtmlBtn, saveBtn, settingsBtn, +notificationsModal, notificationsBtn, codepenBtn, saveHtmlBtn, saveBtn, onboardModal, settingsModal, notificationsBtn, onboardShowInTabOptionBtn, editorThemeLinkTag, onboardDontShowInTabOptionBtn, TextareaAutoComplete, savedItemCountEl, indentationSizeValueEl, runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyleTemplate, @@ -137,7 +137,6 @@ globalConsoleContainerEl jsModelLabel = $('#js-js-mode-label'), titleInput = $('#js-title-input'), addLibrarySelect = $('#js-add-library-select'), - addLibraryBtn = $('#js-add-library-btn'), externalJsTextarea = $('#js-external-js'), externalCssTextarea = $('#js-external-css'); @@ -1295,6 +1294,7 @@ globalConsoleContainerEl gutters: ['CodeMirror-foldgutter'] }); + // DEPRECATED function openSettings() { scope.toggleModal(settingsModal); @@ -1844,6 +1844,18 @@ globalConsoleContainerEl attachListenerForEvent('input'); attachListenerForEvent('keyup'); + // Compile d-open-modal directive + const modalTriggers = $all(`[d-open-modal]`); + modalTriggers.forEach(function(el) { + utils.onButtonClick(el, function() { + scope.toggleModal(window[el.getAttribute('d-open-modal')]); + trackEvent( + el.getAttribute('data-event-category'), + el.getAttribute('data-event-action') + ); + }); + }); + // Compile d-html directive const dHtmlNodes = $all(`[d-html]`); dHtmlNodes.forEach(function(el) { @@ -1919,15 +1931,6 @@ globalConsoleContainerEl layoutBtn3.addEventListener('click', getToggleLayoutButtonListener(3)); layoutBtn4.addEventListener('click', getToggleLayoutButtonListener(4)); - utils.onButtonClick(helpBtn, function() { - scope.toggleModal(helpModal); - trackEvent('ui', 'helpButtonClick'); - }); - utils.onButtonClick(addLibraryBtn, function() { - scope.toggleModal(addLibraryModal); - trackEvent('ui', 'addLibraryButtonClick'); - }); - notificationsBtn.addEventListener('click', function() { scope.toggleModal(notificationsModal); @@ -2157,11 +2160,6 @@ globalConsoleContainerEl } }); - utils.onButtonClick(settingsBtn, function() { - openSettings(); - trackEvent('ui', 'settingsBtnClick'); - }); - // Initialize add library select box var libOptions = window.jsLibs.reduce( (html, lib) => From dbf6723c162d01aaa81a5a0064d473f767ff36e4 Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Thu, 12 Oct 2017 10:30:30 +0530 Subject: [PATCH 07/31] add close btn in modals. fixes #199 --- src/changelog.html | 6 ++++++ src/index.html | 24 ++++++++++++++++++++++++ src/script.js | 13 +++++++++---- src/style.css | 14 ++++++++++++++ 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/src/changelog.html b/src/changelog.html index 4b8c9ce..ea082f5 100644 --- a/src/changelog.html +++ b/src/changelog.html @@ -1,3 +1,9 @@ + + + + + +

Whats new?

diff --git a/src/index.html b/src/index.html index ae9cf92..d199c19 100644 --- a/src/index.html +++ b/src/index.html @@ -243,6 +243,11 @@