ExtJS 4.2: Use the ExtJS naming scheme for js files.

buildVersion.py

@@ -268,10 +268,14 @@ def yuicompressor():
         if os.path.exists(el): 
             os.remove(el)
             print 'Remove javascript library', el
-            
+
     # debug version of the javascript library
     print 'Debug version of the javascript library', JSLIBDEBUG
-    subprocess.call('cat %s/*.js > %s' % (JSLIBSRC, JSLIBDEBUG), shell=True)
+            
+    subprocess.call("find %s -iname '*.js' | sort > JsFiles.txt" % JSLIBSRC, shell=True)
+    jsfiles = ' '.join(open("JsFiles.txt").readlines()).replace('\n', '')
+    subprocess.call("cat %s > %s" % (jsfiles, JSLIBDEBUG), shell=True)
+    os.remove("JsFiles.txt")
 
     # Minified version of the javascript library
     print 'Minified version of the javascript library', JSLIBMIN

modules/plugin_dbui/helper.py

@@ -297,10 +297,8 @@ def get_file_paths(path, ext=None, alpha=True):
             
         elif os.path.isdir(p):
             for file in os.listdir(p):
-                pfile = os.path.join(server_path, el, file)
-                if os.path.isfile(pfile):
-                    if ext and (not pfile.endswith(ext)): continue
-                    li.append(os.path.join(client_path, el, file))
+                pfile = os.path.join(el, file)
+                li.extend(get_file_paths(pfile, ext, alpha))
     
     if alpha:
         li.sort()
@@ -558,7 +556,7 @@ def get_versions():
     server_path, client_path = get_reference_paths()
 
     # plugin dbui
-    fn = os.path.join(server_path, 'static', 'plugin_dbui', 'src', 'base.js')
+    fn = os.path.join(server_path, 'static', 'plugin_dbui', 'src', 'App.js')
     
     fi = open(fn, 'rb')
     s = fi.read()

static/plugin_dbui/src/pregexp.js → static/plugin_dbui/src/form/plugin/RegExp.js

@@ -3,7 +3,7 @@
  * by a regular expression object.
  *
  */
-Ext.define('App.form.plugin.PRegExp',  {
+Ext.define('App.form.plugin.RegExp',  {
 
     extend: 'Ext.AbstractPlugin',
     alias: 'plugin.pRegExp',