SilentLittleCat hace 7 años
padre
commit
c201f1a75a
Se han modificado 2 ficheros con 44 adiciones y 13 borrados
  1. 42 12
      .idea/workspace.xml
  2. 2 1
      static/js/forum_post.js

+ 42 - 12
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+      <change beforePath="$PROJECT_DIR$/static/js/forum_post.js" afterPath="$PROJECT_DIR$/static/js/forum_post.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -33,7 +33,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="403">
@@ -46,17 +46,35 @@
       <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
         <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="217">
-              <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
+            <state relative-caret-position="415">
+              <caret line="769" column="85" lean-forward="true" selection-start-line="769" selection-start-column="85" selection-end-line="769" selection-end-column="85" />
               <folding>
+                <element signature="e#2726#2747#0#HTML" expanded="true" />
                 <marker date="1525013969328" expanded="true" signature="17971:17983" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="forum_post.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="438">
+              <caret line="552" column="21" lean-forward="false" selection-start-line="552" selection-start-column="21" selection-end-line="552" selection-end-column="21" />
+              <folding>
+                <marker date="1525014090661" expanded="true" signature="21665:21692" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>上传</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -67,6 +85,7 @@
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+        <option value="$PROJECT_DIR$/static/js/forum_post.js" />
       </list>
     </option>
   </component>
@@ -145,12 +164,12 @@
       <option name="presentableId" value="Default" />
       <updated>1525013349427</updated>
       <workItem from="1525013350506" duration="115000" />
-      <workItem from="1525013490770" duration="495000" />
+      <workItem from="1525013490770" duration="599000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="610000" />
+    <option name="totallyTimeSpent" value="714000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -220,21 +239,32 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="403">
+          <caret line="362" column="51" lean-forward="false" selection-start-line="362" selection-start-column="51" selection-end-line="362" selection-end-column="51" />
+          <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="217">
-          <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
+        <state relative-caret-position="415">
+          <caret line="769" column="85" lean-forward="true" selection-start-line="769" selection-start-column="85" selection-end-line="769" selection-end-column="85" />
           <folding>
+            <element signature="e#2726#2747#0#HTML" expanded="true" />
             <marker date="1525013969328" expanded="true" signature="17971:17983" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+    <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="362" column="51" lean-forward="false" selection-start-line="362" selection-start-column="51" selection-end-line="362" selection-end-column="51" />
-          <folding />
+        <state relative-caret-position="438">
+          <caret line="552" column="21" lean-forward="false" selection-start-line="552" selection-start-column="21" selection-end-line="552" selection-end-column="21" />
+          <folding>
+            <marker date="1525014090661" expanded="true" signature="21665:21692" ph="..." />
+          </folding>
         </state>
       </provider>
     </entry>

+ 2 - 1
static/js/forum_post.js

xqd
@@ -549,7 +549,8 @@ function uploadWindowload() {
 function uploadWindow(recall, type) {
 	var type = isUndefined(type) ? 'image' : type;
 	UPLOADWINRECALL = recall;
-
+	var fid = (typeof fid == 'undefined' ? '2' : fid);
+	console.log(fid);
 	showWindow('upload', 'forum.php?mod=misc&action=upload&fid=' + fid + '&type=' + type, 'get', 0, {'zindex':601});
 }