Removed psychojs as submodule. Now uses web loading instead of packaging

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "psychojs"]
-	path = psychojs
-	url = https://github.com/psychopy/psychojs

psychopy/experiment/components/settings/__init__.py

@@ -125,7 +125,7 @@ def __init__(self, parentName, exp, expName='', fullScr=True,
                       'Monitor', 'Screen', 'Full-screen window',
                       'Window size (pixels)',
                       'color', 'colorSpace', 'Units', 'HTML path',
-                      'OSF Project ID', 'JS libs']
+                      'OSF Project ID']
         # basic params
         self.params['expName'] = Param(
             expName, valType='str', allowedTypes=[],
@@ -432,19 +432,6 @@ def copyFileWithMD5(src, dst):
                 os.makedirs(dstFolder)
             shutil.copy2(srcFile['abs'], dstAbs)
 
-        # add the js libs if needed for packaging
-        ppRoot = os.path.split(os.path.abspath(psychopy.__file__))[0]
-        jsPath = join(ppRoot, '..', 'psychojs')
-        if os.path.isdir(jsPath):
-            if self.params['JS libs'].val == 'packaged':
-                copyTreeWithMD5(join(jsPath,'php'), join(folder, 'php'))
-                copyTreeWithMD5(join(jsPath,'js'), join(folder, 'js'))
-        else:
-            jsZip = zipfile.ZipFile(os.path.join(ppRoot, 'psychojs.zip'))
-            # copy over JS libs if needed
-            if self.params['JS libs'].val == 'packaged':
-                jsZip.extractall(path=folder)
-
     def writeInitCodeJS(self, buff, version, localDateTime):
         # write info.php and resources folder as well
         self.prepareResourcesJS()

setup.py

@@ -92,7 +92,7 @@
 # for the source dist this doesn't work - use the manifest.in file
 dataExtensions = ['*.txt', '*.ico', '*.jpg', '*.gif', '*.png', '*.mov',
                   '*.spec', '*.csv', '*.psyexp', '*.xlsx', '.zip']
-dataFiles = ['psychopy/psychojs.zip']
+datafiles = []
 
 # post_install only needs installing on win32 but needs packaging in the zip
 scripts = ['psychopy/app/psychopyApp.py',