Summer 2018 Code Tweaks

README.md

@@ -5,8 +5,10 @@ Wick is a browser-based hybrid animation/coding environment for making interacti
 # How to contribute to Wick
 Want to help us make Wick? There's plenty to do, we'd love your help.
 
+Be sure to read the [code of conduct](https://github.com/zrispo/wick-editor/blob/master/code-of-conduct.md)!!
+
 ### Create tutorials
-Wick needs tutorials! If you're interested in making text or video tutorials, contact [@zrispo](https://twitter.com/zrispo), especially if you want to make non-english tutorials! The [tutorial page](http://wickeditor.com/#tutorials) is a good place to start if you want a template.
+Wick needs tutorials! If you're interested in making text or video tutorials, contact us at *contact@wickeditor.com*, especially if you want to make non-english tutorials! The [tutorial page](http://wickeditor.com/#tutorials) is a good place to start if you want a template.
 
 ### Report bugs and submit bug fixes
 Found a bug? Add it to the [issue tracker](https://github.com/zrispo/wick/issues). You can also look at existing bugs in the issue tracker. If you're just getting started, check out the bugs tagged as `small-bugs` - these are smaller fixes that you can do to get acquainted with the codebase.
@@ -27,4 +29,4 @@ If you're a creator that wants to support Wick, one of the most helpful things t
   * `http-server` to start
 * Open a browser window, and go to `http://localhost:8000/`
 
-Need help? Feel free to contact [@zrispo](https://twitter.com/zrispo) (that's me).
+Need help? Feel free to contact us at *contact@wickeditor.com*

bash.exe.stackdump

@@ -0,0 +1,9 @@
+Exception: STATUS_STACK_OVERFLOW at rip=7FFAA279ECE7
+rax=0000000000001250 rbx=00000000FFFF8F90 rcx=0000000000000000
+rdx=0000000180010018 rsi=00000000FFFF8F98 rdi=000000018028E980
+r8 =00000000000B1CA4 r9 =000000018028E980 r10=00000000FFFF7000
+r11=00000000FFE03310 r12=0000000000000420 r13=00000000FFFF8E70
+r14=000000018022F490 r15=00000000FFFF8E10
+rbp=0000000000000208 rsp=00000000FFFF8C88
+program=C:\Program Files\Git\usr\bin\bash.exe, pid 6152, thread 
+cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B

code-of-conduct.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at *contact@wickeditor.com*. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

index.html

@@ -48,8 +48,6 @@
     <link rel="stylesheet" type="text/css" href="styles/progressBar.css">
     <link rel="stylesheet" type="text/css" href="styles/videoExporter.css">
 
-
-
     <script src="lib/jquery.min.js"></script>
     <script src="lib/jquery-ui.custom.min.js"></script>
     <script src="lib/jquery.fancytree.js"></script>
@@ -81,23 +79,23 @@
     <script src="lib/lerp.js"></script>
     <script src="lib/bowser.js"></script>
     <script src="lib/howler.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/pixi.js/4.5.6/pixi.min.js"></script>
+    <script src="lib/pixi.4.5.6.min.js"></script>
     <script src="lib/scrollbar.js"></script>
     <script src="lib/nouislider.js"></script>
     <script src="lib/soundcloud-waveform.js"></script>
-    <script src="lib/saveSvgAsPng.js"></script>
     <script src="lib/html2canvas.js"></script>
     <script src="lib/localstoragewrapper.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.8/ace.js" type="text/javascript" charset="utf-8"></script>
+    <script src="lib/ace/ace.js" type="text/javascript" charset="utf-8"></script>
     <script src="lib/ace/ext-language_tools.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="lib/spectrum.js"></script>
     <script src="lib/pressure.min.js"></script>
     <script src="lib/WickEditorInputs.js"></script>
     <script src="lib/idb-keyval-min.js"></script>
     <script src="lib/offset.js"></script>
-    <script type="text/javascript" src="lib/floodfill.min.js"></script>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
-    <script type="text/javascript" src="lib/video-export/videoExporter.js"></script>
+    <script src="lib/floodfill.min.js" type="text/javascript"></script>
+    <script src="lib/webfont.js" type="text/javascript"></script>
+    <script src="lib/video-export/videoExporter.js" type="text/javascript"></script>
+    <script src="lib/croquis.js"></script>
 
     <script src="src/project/WickDocs.js"></script>
     <script src="src/project/WickFrame.js"></script>
@@ -176,7 +174,7 @@
 <div class="alpha-warning">
     <script>function hideWarning () { var e = document.getElementsByClassName('alpha-warning')[0];e.style.pointerEvents='none';e.style.display='none'; }; if (localStorage.hideWarning) { hideWarning(); };</script>
     <div class="alpha-warning-text">
-        NOTE: The Wick Editor is currently in open beta!<hr class="alpha-warning-hr" />Please report all bugs on <a class="forums-link" href="http://forum.wickeditor.com/" target="_blank">the forums</a>!!
+        NOTE: The Wick Editor is currently in open beta!<hr class="alpha-warning-hr" />Please report all bugs on <a class="forums-link" href="http://forum.wickeditor.com/" target="_blank">the forums</a>.
     </div>
     <div class="alpha-warning-closebutton" onclick="localStorage.hideWarning='true';hideWarning();"></div>
 </div>
@@ -206,7 +204,7 @@
         <div id="breadcrumbsGUI" class="GUIBox"></div>
 
         <div id="editorSettingsGUI" class="GUIBox">
-            <div class="editorSettingsGUITitle">Hotkeys</div>
+            <div class="editorSettingsGUITitle">Keyboard Shortcuts</div>
             <div class="editorSettingsGUICloseButton"></div>
             <div class="editorSettingsGUIHotkeys"></div>
         </div>
@@ -224,7 +222,6 @@
         </div>
 
         <div id="inspectorGUI" class="GUIBox">
-            <div id="inspector-title">Inspector</div>
             <div class="inspector-title-bar">
                 <div class="inspector-selection-icon"></div>
                 <div class="inspector-selection-title"></div>
@@ -234,7 +231,7 @@
                 <div class="inspector-buttons-container"></div>
             </div>
             <div id="treeContainer">
-                <div id="inspector-title">Asset Library</div>
+                <div id="asset-library-title">Asset Library</div>
                 <div id="treeFilterContainer">
                     <input id="treeFilterInput" type="text" placeholder="filter...">
                 </div>

lib/ace/worker-javascript.js

@@ -18,6 +18,11 @@ if (!window.console) {
 window.window = window;
 window.ace = window;
 
+// wick specific - using this for regex thing to squash missing semicolon error
+String.prototype.splice = function(start, delCount, newSubStr) {
+    return this.slice(0, start) + newSubStr + this.slice(start + Math.abs(delCount));
+};
+
 window.onerror = function(message, file, line, col, err) {
     postMessage({type: "error", data: {
         message: message,
@@ -11773,6 +11778,16 @@ oop.inherits(JavaScriptWorker, Mirror);
         if (!value)
             return this.sender.emit("annotate", []);
 
+        // wick specific: add a semicolon to end of on(event) statements to squash missing ";" error
+        var onEventFinderRegex = /^ *on *\( *[a-zA-Z]+ *\)/gm
+        var m;
+        do {
+            m = onEventFinderRegex.exec(value, 'g');
+            if (m) {
+                value = value.splice(m.index + m[0].length, 0, ';')
+            }
+        } while (m);
+
         var errors = [];
         var maxErrorLevel = this.isValidJS(value) ? "warning" : "error";
         lint(value, this.options);