Pman.Tab.MTrackMerger.bjs

Pman.Tab.MTrackMerger.js

diff --git a/Pman.Tab.MTrackMerger.bjs b/Pman.Tab.MTrackMerger.bjs
index 44cb1e6..3509cf2 100644 (file)
--- a/Pman.Tab.MTrackMerger.bjs
+++ b/Pman.Tab.MTrackMerger.bjs
@@ -35,8 +35,8 @@
      "items" : [
       {
        "xtype" : "LayoutRegion",
-       "$ xns" : "Roo",
        "width" : 200,
+       "$ xns" : "Roo",
        "split" : true,
        "* prop" : "west"
       },
@@ -58,8 +58,8 @@
         "render" : "function (_self)\n{\n  _this.tree = _self;\n}"
        },
        "autoScroll" : true,
-       "fitToFrame" : true,
        "region" : "west",
+       "fitToFrame" : true,
        "xtype" : "TreePanel",
        "$ xns" : "Roo",
        "items" : [
@@ -114,9 +114,9 @@
        "listeners" : {
         "|activate" : "function() {\n    _this.panel = this;\n    if (_this.grid) {\n        //_this.grid.footer.onClick('first');\n    }\n}"
        },
+       "background" : true,
        "region" : "center",
        "fitToframe" : true,
-       "background" : true,
        "title" : "core_enum",
        "xtype" : "GridPanel",
        "fitContainer" : true,
@@ -125,7 +125,7 @@
        "items" : [
         {
          "listeners" : {
-          "|rowdblclick" : "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) return;\n    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n",
+          "|rowdblclick" : "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) { return; }\n    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n",
           "|render" : "function() \n{\n    _this.grid = this; \n    //_this.dialog = Pman.Dialog.FILL_IN\n    if (_this.panel.active) {\n       //this.footer.onClick('first');\n    }\n}"
          },
          "autoExpandColumn" : "etype",
@@ -147,8 +147,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/MTrack/Merger.php'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -201,8 +201,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 200,
            "header" : "File",
+           "width" : 200,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -210,8 +210,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 50,
            "header" : "Added",
+           "width" : 50,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -219,8 +219,8 @@
           },
           {
            "xtype" : "ColumnModel",
-           "width" : 50,
            "header" : "Removed",
+           "width" : 50,
            "$ renderer" : "function(v) { return String.format('{0}', v); }",
            "$ xns" : "Roo.grid",
            "* prop" : "colModel[]",
@@ -235,8 +235,8 @@
         "render" : "function (_self)\n{\n  _this.preview = _self;\n}"
        },
        "autoScroll" : true,
-       "fitToFrame" : true,
        "region" : "south",
+       "fitToFrame" : true,
        "title" : "Review Changes",
        "xtype" : "ContentPanel",
        "$ xns" : "Roo"

diff --git a/Pman.Tab.MTrackMerger.js b/Pman.Tab.MTrackMerger.js
index 0ffbf4d..6e81882 100644 (file)
--- a/Pman.Tab.MTrackMerger.js
+++ b/Pman.Tab.MTrackMerger.js
@@ -26,17 +26,15 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
   name     : "Pman.Tab.MTrackMerger",
   disabled : false, 
   permname : '', 
-  _tree : function()
+  _tree : function(_data)
   {
    var _this = this;
    var MODULE = this;
    return {
+   xtype : 'NestedLayoutPanel',
    background : true,
    region : 'center',
    title : _this._strings['06f5aa315f44a2147bab17980d1f6570'] /* Merge Commits */,
-   xns : Roo,
-   '|xns' : 'Roo',
-   xtype : 'NestedLayoutPanel',
    listeners : {
     activate : function (_self)
      {
@@ -46,67 +44,67 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
          } catch(e) {}
      }
    },
+   xns : Roo,
+   '|xns' : 'Roo',
    layout : {
+    xtype : 'BorderLayout',
     xns : Roo,
     '|xns' : 'Roo',
-    xtype : 'BorderLayout',
     center : {
+     xtype : 'LayoutRegion',
      xns : Roo,
-     '|xns' : 'Roo',
-     xtype : 'LayoutRegion'
+     '|xns' : 'Roo'
     },
     west : {
+     xtype : 'LayoutRegion',
      split : true,
      width : 200,
      xns : Roo,
-     '|xns' : 'Roo',
-     xtype : 'LayoutRegion'
+     '|xns' : 'Roo'
     },
     south : {
+     xtype : 'LayoutRegion',
      height : 200,
      split : true,
      titlebar : true,
      xns : Roo,
-     '|xns' : 'Roo',
-     xtype : 'LayoutRegion'
+     '|xns' : 'Roo'
     },
     items  : [
      {
+      xtype : 'TreePanel',
       autoScroll : true,
       fitToFrame : true,
       region : 'west',
-      xns : Roo,
-      '|xns' : 'Roo',
-      xtype : 'TreePanel',
       listeners : {
        render : function (_self)
         {
           _this.tree = _self;
         }
       },
+      xns : Roo,
+      '|xns' : 'Roo',
       toolbar : {
+       xtype : 'Toolbar',
        xns : Roo,
        '|xns' : 'Roo',
-       xtype : 'Toolbar',
        items  : [
         {
-         text : _this._strings['4d1c8263ba1036754f8db14a98f9f006'] /* Reload */,
-         xns : Roo.Toolbar,
-         '|xns' : 'Roo.Toolbar',
          xtype : 'Button',
+         text : _this._strings['4d1c8263ba1036754f8db14a98f9f006'] /* Reload */,
          listeners : {
           click : function (_self, e)
            {
              var t = _this.tree.tree;
              t.loader.load(t.root);
            }
-         }
+         },
+         xns : Roo.Toolbar,
+         '|xns' : 'Roo.Toolbar'
         }
        ]
       },
       tree : {
-       xns : Roo.tree,
-       '|xns' : 'Roo.tree',
        xtype : 'TreePanel',
        listeners : {
         click : function (node, e)
@@ -115,20 +113,20 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
             _this.grid.ds.load.defer(100, _this.grid.ds, [ {} ]);
          }
        },
+       xns : Roo.tree,
+       '|xns' : 'Roo.tree',
        root : {
+        xtype : 'TreeNode',
         text : _this._strings['e63695c4dea40eefb2ef481c7b242192'] /* All Changes */,
         xns : Roo.tree,
-        '|xns' : 'Roo.tree',
-        xtype : 'TreeNode'
+        '|xns' : 'Roo.tree'
        },
        loader : {
+        xtype : 'TreeLoader',
         baseParams : { _tree : 1 },
         dataUrl : baseURL + '/MTrack/Merger',
         requestMethod : 'GET',
         root : 'data',
-        xns : Roo.tree,
-        '|xns' : 'Roo.tree',
-        xtype : 'TreeLoader',
         listeners : {
          beforeload : function (This, node, callback)
           {
@@ -143,20 +141,20 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
           {
            _this.tree.el.unmask();
           }
-        }
+        },
+        xns : Roo.tree,
+        '|xns' : 'Roo.tree'
        }
       }
      },
      {
+      xtype : 'GridPanel',
       background : true,
       fitContainer : true,
       fitToframe : true,
       region : 'center',
       tableName : 'core_enum',
       title : _this._strings['c671c787b49f50a3ace9fdc5bd597825'] /* core_enum */,
-      xns : Roo,
-      '|xns' : 'Roo',
-      xtype : 'GridPanel',
       listeners : {
        activate : function() {
             _this.panel = this;
@@ -165,12 +163,12 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
             }
         }
       },
+      xns : Roo,
+      '|xns' : 'Roo',
       grid : {
+       xtype : 'Grid',
        autoExpandColumn : 'etype',
        loadMask : true,
-       xns : Roo.grid,
-       '|xns' : 'Roo.grid',
-       xtype : 'Grid',
        listeners : {
         render : function() 
          {
@@ -182,24 +180,24 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
          },
         rowdblclick : function (_self, rowIndex, e)
          {
-             if (!_this.dialog) return;
+             if (!_this.dialog) { return; }
              _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {
                  _this.grid.footer.onClick('first');
              }); 
          }
        },
+       xns : Roo.grid,
+       '|xns' : 'Roo.grid',
        toolbar : {
+        xtype : 'Toolbar',
         xns : Roo,
         '|xns' : 'Roo',
-        xtype : 'Toolbar',
         items  : [
          {
+          xtype : 'Button',
           cls : 'x-btn-text-icon',
           icon : Roo.rootURL + 'images/default/dd/drop-add.gif',
           text : _this._strings['cd23e6cc0233eef073cbed0cfebcd6a1'] /* Create Commit Using Patch */,
-          xns : Roo.Toolbar,
-          '|xns' : 'Roo.Toolbar',
-          xtype : 'Button',
           listeners : {
            click : function()
             {
@@ -250,15 +248,15 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
                    animEl: this.el
                });
             }
-          }
+          },
+          xns : Roo.Toolbar,
+          '|xns' : 'Roo.Toolbar'
          },
          {
+          xtype : 'Button',
           cls : 'x-btn-text-icon',
           icon : Roo.rootURL + 'images/default/dd/drop-add.gif',
           text : _this._strings['21bcad367951f7c2e761f744423161b6'] /* Create Commit Using Merge */,
-          xns : Roo.Toolbar,
-          '|xns' : 'Roo.Toolbar',
-          xtype : 'Button',
           listeners : {
            click : function()
             {
@@ -300,16 +298,16 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
                    animEl: this.el
                });
             }
-          }
+          },
+          xns : Roo.Toolbar,
+          '|xns' : 'Roo.Toolbar'
          }
         ]
        },
        dataSource : {
+        xtype : 'Store',
         remoteSort : false,
         sortInfo : { field: 'filename', dir : 'ASC' },
-        xns : Roo.data,
-        '|xns' : 'Roo.data',
-        xtype : 'Store',
         listeners : {
          beforeload : function (_self, options)
           {
@@ -335,14 +333,17 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
           
           }
         },
+        xns : Roo.data,
+        '|xns' : 'Roo.data',
         proxy : {
+         xtype : 'HttpProxy',
          method : 'GET',
          url : baseURL + '/MTrack/Merger.php',
          xns : Roo.data,
-         '|xns' : 'Roo.data',
-         xtype : 'HttpProxy'
+         '|xns' : 'Roo.data'
         },
         reader : {
+         xtype : 'JsonReader',
          fields : [
              {
                  'name': 'id',
@@ -366,15 +367,12 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
          root : 'data',
          totalProperty : 'total',
          xns : Roo.data,
-         '|xns' : 'Roo.data',
-         xtype : 'JsonReader'
+         '|xns' : 'Roo.data'
         }
        },
        sm : {
-        singleSelect : false,
-        xns : Roo.grid,
-        '|xns' : 'Roo.grid',
         xtype : 'RowSelectionModel',
+        singleSelect : false,
         listeners : {
          afterselectionchange : function (_self)
           {
@@ -406,53 +404,55 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
              
              
           }
-        }
+        },
+        xns : Roo.grid,
+        '|xns' : 'Roo.grid'
        },
        colModel : [
         {
+         xtype : 'ColumnModel',
          dataIndex : 'filename',
          header : _this._strings['0b27918290ff5323bea1e3b78a9cf04e'] /* File */,
          renderer : function(v) { return String.format('{0}', v); },
          width : 200,
          xns : Roo.grid,
-         '|xns' : 'Roo.grid',
-         xtype : 'ColumnModel'
+         '|xns' : 'Roo.grid'
         },
         {
+         xtype : 'ColumnModel',
          dataIndex : 'added',
          header : _this._strings['f29ddbfb905eb2593fdcdfb243f9af85'] /* Added */,
          renderer : function(v) { return String.format('{0}', v); },
          width : 50,
          xns : Roo.grid,
-         '|xns' : 'Roo.grid',
-         xtype : 'ColumnModel'
+         '|xns' : 'Roo.grid'
         },
         {
+         xtype : 'ColumnModel',
          dataIndex : 'removed',
          header : _this._strings['93f07b720ebf7d1246512569761a5804'] /* Removed */,
          renderer : function(v) { return String.format('{0}', v); },
          width : 50,
          xns : Roo.grid,
-         '|xns' : 'Roo.grid',
-         xtype : 'ColumnModel'
+         '|xns' : 'Roo.grid'
         }
        ]
       }
      },
      {
+      xtype : 'ContentPanel',
       autoScroll : true,
       fitToFrame : true,
       region : 'south',
       title : _this._strings['66717bf2b8235cc94a52d5b815d57a54'] /* Review Changes */,
-      xns : Roo,
-      '|xns' : 'Roo',
-      xtype : 'ContentPanel',
       listeners : {
        render : function (_self)
         {
           _this.preview = _self;
         }
-      }
+      },
+      xns : Roo,
+      '|xns' : 'Roo'
      }
     ]
    }