test

.idea/workspace.xml

@@ -58,29 +58,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="550">
-              <caret line="17" column="81" lean-forward="true" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
+            <state relative-caret-position="581">
+              <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
               <folding>
-                <marker date="1525272246879" expanded="true" signature="18737:18749" ph="..." />
+                <marker date="1525272585635" expanded="true" signature="18744:18756" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/common.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="283">
-              <caret line="1209" column="49" lean-forward="true" selection-start-line="1209" selection-start-column="49" selection-end-line="1209" selection-end-column="49" />
+            <state relative-caret-position="345">
+              <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
               <folding>
-                <marker date="1525272320958" expanded="true" signature="32210:32216" ph=" " />
-                <marker date="1525272320958" expanded="true" signature="32216:32222" ph=" " />
-                <marker date="1525272320958" expanded="true" signature="36361:36367" ph=" " />
-                <marker date="1525272320958" expanded="true" signature="36367:36373" ph=" " />
-                <marker date="1525272320958" expanded="true" signature="41678:41684" ph="..." />
+                <marker date="1525272579161" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525272579161" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525272579161" expanded="true" signature="36343:36349" ph=" " />
+                <marker date="1525272579161" expanded="true" signature="36349:36355" ph=" " />
+                <marker date="1525272579161" expanded="true" signature="41659:41665" ph="..." />
               </folding>
             </state>
           </provider>
@@ -126,8 +126,8 @@
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/static/js/common.js" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -224,12 +224,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="8228000" />
+      <workItem from="1525227575525" duration="8491000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13058000" />
+    <option name="totallyTimeSpent" value="13321000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -272,7 +272,7 @@
         <state relative-caret-position="23901">
           <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
           <folding>
-            <marker date="1525272246879" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525272585635" expanded="true" signature="18744:18756" ph="..." />
           </folding>
         </state>
       </provider>
@@ -436,16 +436,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="17" column="81" lean-forward="true" selection-start-line="17" selection-start-column="81" selection-end-line="17" selection-end-column="81" />
-          <folding>
-            <marker date="1525272246879" expanded="true" signature="18737:18749" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="491">
@@ -460,14 +450,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/static/js/common.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="1209" column="49" lean-forward="true" selection-start-line="1209" selection-start-column="49" selection-end-line="1209" selection-end-column="49" />
+        <state relative-caret-position="345">
+          <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
+          <folding>
+            <marker date="1525272579161" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525272579161" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525272579161" expanded="true" signature="36343:36349" ph=" " />
+            <marker date="1525272579161" expanded="true" signature="36349:36355" ph=" " />
+            <marker date="1525272579161" expanded="true" signature="41659:41665" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="581">
+          <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
           <folding>
-            <marker date="1525272320958" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525272320958" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525272320958" expanded="true" signature="36361:36367" ph=" " />
-            <marker date="1525272320958" expanded="true" signature="36367:36373" ph=" " />
-            <marker date="1525272320958" expanded="true" signature="41678:41684" ph="..." />
+            <marker date="1525272585635" expanded="true" signature="18744:18756" ph="..." />
           </folding>
         </state>
       </provider>

data/template/3_diy_group_group.tpl.php

@@ -15,7 +15,7 @@
     <link rel="stylesheet" type="text/css" href="data/cache/slick/slick.css"/>
     <link rel="stylesheet" type="text/css" href="data/cache/slick/slick-theme.css"/>
     <link rel="stylesheet" type="text/css" href="data/cache/font-awesome/css/fontawesome-all.min.css"/>
-    <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>
+<!--    <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>-->
     <script type="text/javascript" src="data/cache/slick/slick.min.js"></script>
     <script type="text/javascript" src="/data/cache/area-select/area.js"></script>
     <script src="static/js/forum_post.js?tDV" type="text/javascript"></script>

static/js/common.js

@@ -1148,7 +1148,7 @@ function showWindow(k, url, mode, cache, menuv) {
 	cache = isUndefined(cache) ? 1 : cache;
 	var menuid = 'fwin_' + k;
 
-	var menuObj = $('#' + menuid);
+	var menuObj = $(menuid);
 	var drag = null;
 	var loadingst = null;
 	var hidedom = '';
@@ -1201,13 +1201,13 @@ function showWindow(k, url, mode, cache, menuv) {
 		showMenu(v);
 	};
 
-	if(menuObj.length <= 0) {
+	if(!menuObj) {
 
 		menuObj = document.createElement('div');
 		menuObj.id = menuid;
 		menuObj.className = 'fwinmask';
 		menuObj.style.display = 'none';
-		$('#append_parent').appendChild(menuObj);
+		$('append_parent').appendChild(menuObj);
 		evt = ' style="cursor:move" onmousedown="dragMenu($(\'' + menuid + '\'), event, 1)" ondblclick="hideWindow(\'' + k + '\')"';
 		if(!BROWSER.ie) {
 			hidedom = '<style type="text/css">object{visibility:hidden;}</style>';
@@ -1215,7 +1215,7 @@ function showWindow(k, url, mode, cache, menuv) {
 		menuObj.innerHTML = hidedom + '<table cellpadding="0" cellspacing="0" class="fwin"><tr><td class="t_l"></td><td class="t_c"' + evt + '></td><td class="t_r"></td></tr><tr><td class="m_l"' + evt + ')">&nbsp;&nbsp;</td><td class="m_c" id="fwin_content_' + k + '">'
 			+ '</td><td class="m_r"' + evt + '"></td></tr><tr><td class="b_l"></td><td class="b_c"' + evt + '></td><td class="b_r"></td></tr></table>';
 		if(mode == 'html') {
-			$('#fwin_content_' + k).innerHTML = url;
+			$('fwin_content_' + k).innerHTML = url;
 			initMenu();
 			show();
 		} else {