add session name validation to frontpage

add some more exceptions to GLSL outline
fix issue with invalid session name for sharedb with mongodb
update prod files
update documentation

client/dist/worker/audio_to_image.js

@@ -6296,6 +6296,28 @@ var _webMIDISupport = function () {
     }
 };
 
+var _objSwap = function (src, dst) {
+    var k = null,
+
+        dst_data = null;
+
+    for (k in src) {
+        dst_data = dst[k];
+
+        dst[k] = src[k];
+        src[k] = dst_data;
+    }
+};
+
+var _swapArrayItem = function (arr, a, b) {
+    var temp = arr[a];
+
+    arr[a] = arr[b];
+    arr[b] = temp;
+
+    return arr;
+};
+
 var _isPowerOf2 = function (value) {
     return (value & (value - 1)) === 0;
 };

client/dist/worker/image_to_audio.js

@@ -3992,6 +3992,28 @@ var _webMIDISupport = function () {
     }
 };
 
+var _objSwap = function (src, dst) {
+    var k = null,
+
+        dst_data = null;
+
+    for (k in src) {
+        dst_data = dst[k];
+
+        dst[k] = src[k];
+        src[k] = dst_data;
+    }
+};
+
+var _swapArrayItem = function (arr, a, b) {
+    var temp = arr[a];
+
+    arr[a] = arr[b];
+    arr[b] = temp;
+
+    return arr;
+};
+
 var _isPowerOf2 = function (value) {
     return (value & (value - 1)) === 0;
 };

client/js/app_fs.js

@@ -116,6 +116,8 @@ var FragmentSynth = function (params) {
     ************************************************************/
 
     var _fs_state = 1,
+
+        _documentation_link = "https://www.fsynth.com/documentation.html",
 
         _username = localStorage.getItem('fs-user-name'),
         _local_session_settings = localStorage.getItem(_getSessionName()),

client/js/discuss.js

@@ -144,7 +144,17 @@ _right_dialog = WUI_Dialog.create(_discuss_dialog_id, {
     detachable: false,
 
     min_width: 300,
-    min_height: 200
+    min_height: 200,
+
+    header_btn: [
+        {
+            title: "Help",
+            on_click: function () {
+                window.open(_documentation_link + "#subsec5_12"); 
+            },
+            class_name: "fs-help-icon"
+        }
+    ]
 });
 
 _setUsersList([]);

client/js/inputs.js

@@ -148,7 +148,17 @@ var _createChannelSettingsDialog = function (input_channel_id) {
         detachable: false,
 
         min_width: 200,
-        min_height: 250
+        min_height: 250,
+
+        header_btn: [
+            {
+                title: "Help",
+                on_click: function () {
+                    window.open(_documentation_link + "#subsec5_5"); 
+                },
+                class_name: "fs-help-icon"
+            }
+        ]
     });
 };
 

client/js/network.js

@@ -66,7 +66,7 @@ var _shareDBConnect = function () {
 
     _sharedb_connection = new ShareDB.Connection(ws);
 
-    _sharedb_doc = _sharedb_connection.get(_session, "fs");
+    _sharedb_doc = _sharedb_connection.get("_" + _session, "fs");
 
     _sharedb_doc.on('error', _sharedbDocError);
 
@@ -113,7 +113,7 @@ var _shareDBConnect = function () {
         _sharedb_doc_ready = true;
     });
 
-    _sharedb_ctrl_doc = _sharedb_connection.get(_session, "ctrls");
+    _sharedb_ctrl_doc = _sharedb_connection.get("_" + _session, "ctrls");
     _sharedb_ctrl_doc.on('error', _sharedbDocError);
 
     _sharedb_ctrl_doc.subscribe(function(err) {

client/js/ui.js

@@ -286,7 +286,17 @@ var _uiInit = function () {
 
             status_bar: false,
             detachable: false,
-            draggable: true
+            draggable: true,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_8"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
 
     if (fs_settings_monophonic === "true") {
@@ -575,7 +585,17 @@ var _uiInit = function () {
 
             status_bar: false,
             detachable: false,
-            draggable: true
+            draggable: true,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_9"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
 
     _record_dialog = WUI_Dialog.create(_record_dialog_id, {
@@ -593,7 +613,17 @@ var _uiInit = function () {
             detachable: false,
             draggable: true,
 
-            on_close: _onRecordDialogClose
+            on_close: _onRecordDialogClose,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_10"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
 
     _import_dialog = WUI_Dialog.create(_import_dialog_id, {
@@ -611,7 +641,17 @@ var _uiInit = function () {
             detachable: true,
             draggable: true,
 
-            on_close: _onImportDialogClose
+            on_close: _onImportDialogClose,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_5"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
 
     WUI_ToolBar.create("fs_import_toolbar", {
@@ -659,9 +699,19 @@ var _uiInit = function () {
 
             status_bar: false,
             detachable: true,
-            draggable: true
+            draggable: true,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_11"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
-
+/*
     _analysis_dialog = WUI_Dialog.create(_analysis_dialog_id, {
             title: "Audio analysis",
 
@@ -679,7 +729,7 @@ var _uiInit = function () {
         
             on_close: _disconnectAnalyserNode
         });
-    
+*/  
     _help_dialog = WUI_Dialog.create(_help_dialog_id, {
             title: "Fragment - Help",
 
@@ -710,7 +760,17 @@ var _uiInit = function () {
             detachable: false,
 
             status_bar: true,
-            draggable: true
+            draggable: true,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_3_1"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
 
     _controls_dialog = WUI_Dialog.create(_controls_dialog_id, {
@@ -758,6 +818,16 @@ var _uiInit = function () {
 
             status_bar: false,
             detachable: true,
+
+            header_btn: [
+                {
+                    title: "Help",
+                    on_click: function () {
+                        window.open(_documentation_link + "#subsec5_13"); 
+                    },
+                    class_name: "fs-help-icon"
+                }
+            ]
         });
 
     WUI_ToolBar.create("fs_record_toolbar", {

client/js/worker/parse_glsl.js

@@ -27,7 +27,7 @@ var parse_statements = function (statements, root) {
 
     for (i = 0; i < statements.length; i += 1) {
         statement = statements[i];
-        
+
         if (statement.name === "main" && 
             statement.type === "function_declaration") {
 
@@ -49,7 +49,8 @@ var parse_statements = function (statements, root) {
                 declarator = statement.declarators[j];
 
                 if (root) {
-                    if ((declarator.name.name in root_declarator_exceptions)) {
+                    if ((declarator.name.name in root_declarator_exceptions) ||
+                       (declarator.name.name.match(/iInput\d+/g) && statement.typeAttribute.name === "sampler2D")) {
                         continue;
                     }
                 }