Browse Source

combine mapping information into one object

ryohek 5 years ago
parent
commit
0ddaa2e9f4

+ 2 - 3
src/client/js/components/PageEditor/GridEditModal.jsx

@@ -181,14 +181,13 @@ export default class GridEditModal extends React.PureComponent {
 
 function GridDivisionMenu() {
   const gridDivisions = geu.mappingAllGridDivisionPatterns;
-  const numberOfGridDivisions = geu.numberOfGridDivisions;
   return (
     <div className="row">
       {gridDivisions.map((gridDivion, i) => {
         return (
           <div className="col-md-4 text-center">
-            <h6 className="dropdown-header">{numberOfGridDivisions[i]}分割</h6>
-            {gridDivion.map((gridOneDivision) => {
+            <h6 className="dropdown-header">{gridDivion.numberOfGridDivisions}分割</h6>
+            {gridDivion.mapping.map((gridOneDivision) => {
               return (
                 <a className="dropdown-item" href="#">
                   <div className="row">

+ 12 - 10
src/client/js/components/PageEditor/GridEditorUtil.js

@@ -8,17 +8,19 @@ class GridEditorUtil {
     this.lineBeginPartOfGridRE = /^:::(\s.*)editable-row$/;
     this.lineEndPartOfGridRE = /^:::$/;
     this.mappingAllGridDivisionPatterns = [
-      [
-        [2, 10], [4, 8], [6, 6], [8, 4], [10, 2],
-      ],
-      [
-        [2, 5, 5], [5, 2, 5], [5, 5, 2], [4, 4, 4], [3, 3, 6], [3, 6, 3], [6, 3, 3],
-      ],
-      [
-        [2, 2, 4, 4], [4, 4, 2, 2], [2, 4, 2, 4], [4, 2, 4, 2], [3, 3, 3, 3], [2, 2, 2, 6], [6, 2, 2, 2],
-      ],
+      {
+        numberOfGridDivisions: 2,
+        mapping: [[2, 10], [4, 8], [6, 6], [8, 4], [10, 2]]
+      },
+      {
+        numberOfGridDivisions: 3,
+        mapping: [[2, 5, 5], [5, 2, 5], [5, 5, 2], [4, 4, 4], [3, 3, 6], [3, 6, 3], [6, 3, 3]]
+      },
+      {
+        numberOfGridDivisions: 4,
+        mapping: [[2, 2, 4, 4], [4, 4, 2, 2], [2, 4, 2, 4], [4, 2, 4, 2], [3, 3, 3, 3], [2, 2, 2, 6], [6, 2, 2, 2]]
+      }
     ];
-    this.numberOfGridDivisions = [2, 3, 4];
     this.isInGridBlock = this.isInGridBlock.bind(this);
     this.replaceGridWithHtmlWithEditor = this.replaceGridWithHtmlWithEditor.bind(this);
   }