SilentLittleCat 7 years ago
parent
commit
49030ab96d
3 changed files with 52 additions and 13 deletions
  1. 51 12
      .idea/workspace.xml
  2. 1 0
      data/template/3_diy_group_group.tpl.php
  3. 0 1
      static/js/forum_post.js

+ 51 - 12
.idea/workspace.xml

xqd xqd xqd xqd xqd
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.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" />
@@ -46,11 +47,11 @@
       <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="446">
-              <caret line="770" column="67" lean-forward="false" selection-start-line="770" selection-start-column="67" selection-end-line="770" selection-end-column="67" />
+            <state relative-caret-position="594">
+              <caret line="1377" column="30" lean-forward="false" selection-start-line="1377" selection-start-column="30" selection-end-line="1377" selection-end-column="30" />
               <folding>
                 <element signature="e#2726#2747#0#HTML" expanded="true" />
-                <marker date="1525014211052" expanded="true" signature="17971:17983" ph="..." />
+                <marker date="1525014446250" expanded="true" signature="17971:17983" ph="..." />
               </folding>
             </state>
           </provider>
@@ -60,9 +61,25 @@
         <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" />
+              <caret line="552" column="12" lean-forward="false" selection-start-line="552" selection-start-column="12" selection-end-line="552" selection-end-column="12" />
               <folding>
-                <marker date="1525014090661" expanded="true" signature="21665:21692" ph="..." />
+                <marker date="1525014248552" expanded="true" signature="21646:21673" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="2103">
+              <caret line="514" column="5" lean-forward="true" selection-start-line="514" selection-start-column="5" selection-end-line="514" selection-end-column="5" />
+              <folding>
+                <marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525011696005" expanded="true" signature="36341:36347" ph=" " />
+                <marker date="1525011696005" expanded="true" signature="36347:36353" ph=" " />
+                <marker date="1525011696005" expanded="true" signature="41657:41663" ph="..." />
               </folding>
             </state>
           </provider>
@@ -164,12 +181,12 @@
       <option name="presentableId" value="Default" />
       <updated>1525013349427</updated>
       <workItem from="1525013350506" duration="115000" />
-      <workItem from="1525013490770" duration="718000" />
+      <workItem from="1525013490770" duration="952000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="833000" />
+    <option name="totallyTimeSpent" value="1067000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -247,23 +264,45 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/misc.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <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" />
+          <caret line="552" column="12" lean-forward="false" selection-start-line="552" selection-start-column="12" selection-end-line="552" selection-end-column="12" />
+          <folding>
+            <marker date="1525014248552" expanded="true" signature="21646:21673" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/common.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2103">
+          <caret line="514" column="5" lean-forward="true" selection-start-line="514" selection-start-column="5" selection-end-line="514" selection-end-column="5" />
           <folding>
-            <marker date="1525014090661" expanded="true" signature="21665:21692" ph="..." />
+            <marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525011696005" expanded="true" signature="36341:36347" ph=" " />
+            <marker date="1525011696005" expanded="true" signature="36347:36353" ph=" " />
+            <marker date="1525011696005" expanded="true" signature="41657:41663" 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="446">
-          <caret line="770" column="67" lean-forward="false" selection-start-line="770" selection-start-column="67" selection-end-line="770" selection-end-column="67" />
+        <state relative-caret-position="594">
+          <caret line="1377" column="30" lean-forward="false" selection-start-line="1377" selection-start-column="30" selection-end-line="1377" selection-end-column="30" />
           <folding>
             <element signature="e#2726#2747#0#HTML" expanded="true" />
-            <marker date="1525014211052" expanded="true" signature="17971:17983" ph="..." />
+            <marker date="1525014446250" expanded="true" signature="17971:17983" ph="..." />
           </folding>
         </state>
       </provider>

+ 1 - 0
data/template/3_diy_group_group.tpl.php

xqd
@@ -1375,6 +1375,7 @@ EOF;
 
         function updatecinemaattach(aid, url, attachurl) {
             $('activityaid').value = aid;
+            console.log('no');
             $('activityattach_image').innerHTML = '<img src="' + attachurl + '/' + url + '" class="spimg" />';
             ATTACHORIMAGE = 1;
         }

+ 0 - 1
static/js/forum_post.js

xqd
@@ -550,7 +550,6 @@ 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});
 }