fix queryvalecommand

.idea/workspace.xml

@@ -88,12 +88,10 @@
       <change type="DELETED" beforePath="C:\work\Code\workspace\DjangoUeditor\DjangoUeditor\static\ueditor\ueditor_all.js" afterPath="" />
       <change type="DELETED" beforePath="C:\work\Code\workspace\DjangoUeditor\DjangoUeditor\static\ueditor\uparse.js" afterPath="" />
       <change type="DELETED" beforePath="C:\work\Code\workspace\DjangoUeditor\DjangoUeditor\static\ueditor\标签div不转p_不过滤style_script的editor_all_min.js" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MANIFEST" afterPath="$PROJECT_DIR$/MANIFEST" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DjangoUeditor/commands.py" afterPath="$PROJECT_DIR$/DjangoUeditor/commands.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TestApp/models.py" afterPath="$PROJECT_DIR$/TestApp/models.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/readme.md" afterPath="$PROJECT_DIR$/readme.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DjangoUeditor/templates/ueditor.html" afterPath="$PROJECT_DIR$/DjangoUeditor/templates/ueditor.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DjangoUeditor/views.py" afterPath="$PROJECT_DIR$/DjangoUeditor/views.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DjangoUeditor/widgets.py" afterPath="$PROJECT_DIR$/DjangoUeditor/widgets.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/setup.py" afterPath="$PROJECT_DIR$/setup.py" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="DjangoUeditor.iws" />
@@ -137,11 +135,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="commands.py" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="commands.py" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/DjangoUeditor/commands.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="2009" max-vertical-offset="4114">
-              <caret line="111" column="17" selection-start-line="111" selection-start-column="17" selection-end-line="111" selection-end-column="17" />
+            <state vertical-scroll-proportion="0.62666667" vertical-offset="1371" max-vertical-offset="4092">
+              <caret line="74" column="46" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
               <folding />
             </state>
           </provider>
@@ -150,14 +148,14 @@
       <file leaf-file-name="views.py" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/TestApp/views.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="858">
-              <caret line="28" column="43" selection-start-line="28" selection-start-column="43" selection-end-line="28" selection-end-column="43" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="858">
+              <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="readme.md" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="readme.md" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/readme.md">
           <provider selected="true" editor-type-id="MarkdownPreviewEditor">
             <state />
@@ -174,7 +172,7 @@
         <entry file="file://$PROJECT_DIR$/DjangoUeditor/models.py">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="814">
-              <caret line="14" column="168" selection-start-line="14" selection-start-column="168" selection-end-line="14" selection-end-column="168" />
+              <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
               <folding />
             </state>
           </provider>
@@ -193,8 +191,8 @@
       <file leaf-file-name="models.py" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/TestApp/models.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="132" max-vertical-offset="1694">
-              <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="30" selection-end-column="11" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1782">
+              <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
               <folding>
                 <element signature="e#16#44#0" expanded="true" />
               </folding>
@@ -251,12 +249,12 @@
         <option value="$PROJECT_DIR$/DjangoUeditor/forms.py" />
         <option value="$PROJECT_DIR$/DjangoUeditor/models.py" />
         <option value="$PROJECT_DIR$/DjangoUeditor/views.py" />
-        <option value="$PROJECT_DIR$/DjangoUeditor/commands.py" />
         <option value="$PROJECT_DIR$/DjangoUeditor/widgets.py" />
         <option value="$PROJECT_DIR$/DjangoUeditor/templates/ueditor.html" />
-        <option value="$PROJECT_DIR$/TestApp/models.py" />
         <option value="$PROJECT_DIR$/DjangoUeditor/settings.py" />
         <option value="$PROJECT_DIR$/readme.md" />
+        <option value="$PROJECT_DIR$/DjangoUeditor/commands.py" />
+        <option value="$PROJECT_DIR$/TestApp/models.py" />
       </list>
     </option>
   </component>
@@ -665,12 +663,13 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
     <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19637462" sideWeight="0.6319613" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19486405" sideWeight="0.36784142" order="0" side_tool="false" content_ui="combo" />
@@ -683,7 +682,6 @@
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32879046" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -729,7 +727,14 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="190" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="python-line">
+          <url>file://$PROJECT_DIR$/TestApp/models.py</url>
+          <line>39</line>
+          <option name="timeStamp" value="190" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="194" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
@@ -1058,14 +1063,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DjangoUeditor/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="227" max-vertical-offset="814">
-          <caret line="14" column="168" selection-start-line="14" selection-start-column="168" selection-end-line="14" selection-end-column="168" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/Python27/Lib/site-packages/django/forms/forms.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33333334" vertical-offset="4448" max-vertical-offset="12672">
@@ -1082,16 +1079,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/TestApp/models.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="132" max-vertical-offset="1694">
-          <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="30" selection-end-column="11" />
-          <folding>
-            <element signature="e#16#44#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/DjangoUeditor/widgets.py">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2350" max-vertical-offset="3036">
@@ -1108,29 +1095,47 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DjangoUeditor/commands.py">
+    <entry file="file://$PROJECT_DIR$/readme.md">
+      <provider selected="true" editor-type-id="MarkdownPreviewEditor">
+        <state />
+      </provider>
+      <provider editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="5456" max-vertical-offset="5808">
+          <caret line="257" column="3" selection-start-line="257" selection-start-column="3" selection-end-line="257" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DjangoUeditor/models.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="2009" max-vertical-offset="4114">
-          <caret line="111" column="17" selection-start-line="111" selection-start-column="17" selection-end-line="111" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="814">
+          <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TestApp/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="858">
-          <caret line="28" column="43" selection-start-line="28" selection-start-column="43" selection-end-line="28" selection-end-column="43" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="858">
+          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/readme.md">
-      <provider selected="true" editor-type-id="MarkdownPreviewEditor">
-        <state />
+    <entry file="file://$PROJECT_DIR$/TestApp/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1782">
+          <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
+          <folding>
+            <element signature="e#16#44#0" expanded="true" />
+          </folding>
+        </state>
       </provider>
-      <provider editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="5456" max-vertical-offset="5808">
-          <caret line="257" column="3" selection-start-line="257" selection-start-column="3" selection-end-line="257" selection-end-column="3" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DjangoUeditor/commands.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.62666667" vertical-offset="1371" max-vertical-offset="4092">
+          <caret line="74" column="46" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
           <folding />
         </state>
       </provider>

DjangoUeditor/commands.py

@@ -45,9 +45,7 @@ class UEditorCommand(object):
         """" 创建ueditor的ui扩展对象的js代码，如button,combo等  """
         raise NotImplementedError
 
-    def render_queryvalue_command(self):
-        """"生成通过ajax调用后端命令的前端ajax代码"""
-        return ""
+
 
     def render_ajax_command(self):
         """"生成通过ajax调用后端命令的前端ajax代码"""
@@ -71,7 +69,7 @@ class UEditorCommand(object):
         """" 返回注册命令的js定义  """
         cmd=self.onExecuteCommand()
         ajax_cmd=self.render_ajax_command()
-        queryvalue_command=self.render_queryvalue_command()
+        queryvalue_command=self.onExecuteQueryvalueCommand()
         cmds=[]
         if cmd or ajax_cmd:
             cmds.append( u"""execCommand: function() {
@@ -113,7 +111,8 @@ class UEditorCommand(object):
     def onExecuteAjaxCommand(self,state):
         """ 返回执行Command时发起Ajax调用成功与失败的js代码 """
         return ""
-    def onQueryCommandValue(selfself):
+    def onExecuteQueryvalueCommand(self):
+        """"生成通过ajax调用后端命令的前端ajax代码"""
         return ""
 
 class UEditorButtonCommand(UEditorCommand):

MANIFEST

@@ -1,8 +1,7 @@
 # file GENERATED by distutils, do NOT edit
-README.txt
 setup.py
 DjangoUeditor\__init__.py
-DjangoUeditor\fields.py
+DjangoUeditor\commands.py
 DjangoUeditor\forms.py
 DjangoUeditor\models.py
 DjangoUeditor\settings.py
@@ -10,12 +9,43 @@ DjangoUeditor\urls.py
 DjangoUeditor\utils.py
 DjangoUeditor\views.py
 DjangoUeditor\widgets.py
+DjangoUeditor\static\ueditor\UEditorSnapscreen.exe
 DjangoUeditor\static\ueditor\index.html
 DjangoUeditor\static\ueditor\ueditor.all.js
 DjangoUeditor\static\ueditor\ueditor.all.min.js
 DjangoUeditor\static\ueditor\ueditor.config.js
 DjangoUeditor\static\ueditor\ueditor.parse.js
 DjangoUeditor\static\ueditor\ueditor.parse.min.js
+DjangoUeditor\static\ueditor\_examples\addCustomizeButton.js
+DjangoUeditor\static\ueditor\_examples\addCustomizeCombox.js
+DjangoUeditor\static\ueditor\_examples\addCustomizeDialog.js
+DjangoUeditor\static\ueditor\_examples\charts.html
+DjangoUeditor\static\ueditor\_examples\completeDemo.html
+DjangoUeditor\static\ueditor\_examples\customPluginDemo.html
+DjangoUeditor\static\ueditor\_examples\customToolbarDemo.html
+DjangoUeditor\static\ueditor\_examples\customizeDialogPage.html
+DjangoUeditor\static\ueditor\_examples\customizeToolbarUIDemo.html
+DjangoUeditor\static\ueditor\_examples\editor_api.js
+DjangoUeditor\static\ueditor\_examples\filterRuleDemo.html
+DjangoUeditor\static\ueditor\_examples\highlightDemo.html
+DjangoUeditor\static\ueditor\_examples\index.html
+DjangoUeditor\static\ueditor\_examples\jqueryCompleteDemo.html
+DjangoUeditor\static\ueditor\_examples\jqueryValidation.html
+DjangoUeditor\static\ueditor\_examples\multiDemo.html
+DjangoUeditor\static\ueditor\_examples\multiEditorWithOneInstance.html
+DjangoUeditor\static\ueditor\_examples\renderInTable.html
+DjangoUeditor\static\ueditor\_examples\resetDemo.html
+DjangoUeditor\static\ueditor\_examples\sectiondemo.html
+DjangoUeditor\static\ueditor\_examples\setWidthHeightDemo.html
+DjangoUeditor\static\ueditor\_examples\simpleDemo.html
+DjangoUeditor\static\ueditor\_examples\sortableDemo.html
+DjangoUeditor\static\ueditor\_examples\submitFormDemo.html
+DjangoUeditor\static\ueditor\_examples\textareaDemo.html
+DjangoUeditor\static\ueditor\_examples\uparsedemo.html
+DjangoUeditor\static\ueditor\_examples\server\getContent.ashx
+DjangoUeditor\static\ueditor\_examples\server\getContent.asp
+DjangoUeditor\static\ueditor\_examples\server\getContent.jsp
+DjangoUeditor\static\ueditor\_examples\server\getContent.php
 DjangoUeditor\static\ueditor\dialogs\internal.js
 DjangoUeditor\static\ueditor\dialogs\anchor\anchor.html
 DjangoUeditor\static\ueditor\dialogs\attachment\attachment.css
@@ -177,6 +207,12 @@ DjangoUeditor\static\ueditor\lang\zh-cn\images\copy.png
 DjangoUeditor\static\ueditor\lang\zh-cn\images\localimage.png
 DjangoUeditor\static\ueditor\lang\zh-cn\images\music.png
 DjangoUeditor\static\ueditor\lang\zh-cn\images\upload.png
+DjangoUeditor\static\ueditor\php\Uploader.class.php
+DjangoUeditor\static\ueditor\php\action_crawler.php
+DjangoUeditor\static\ueditor\php\action_list.php
+DjangoUeditor\static\ueditor\php\action_upload.php
+DjangoUeditor\static\ueditor\php\config.json
+DjangoUeditor\static\ueditor\php\controller.php
 DjangoUeditor\static\ueditor\themes\iframe.css
 DjangoUeditor\static\ueditor\themes\default\dialogbase.css
 DjangoUeditor\static\ueditor\themes\default\css\ueditor.css
@@ -281,3 +317,4 @@ DjangoUeditor\static\ueditor\third-party\zeroclipboard\ZeroClipboard.js
 DjangoUeditor\static\ueditor\third-party\zeroclipboard\ZeroClipboard.min.js
 DjangoUeditor\static\ueditor\third-party\zeroclipboard\ZeroClipboard.swf
 DjangoUeditor\templates\ueditor.html
+DjangoUeditor\templates\ueditor_old.html

TestApp/models.py

@@ -36,6 +36,10 @@ class myBtn(UEditorButtonCommand):
             alert("爽!");
             editor.execCommand(uiName);
         """
+    def onExecuteQueryvalueCommand(self):
+        return """
+            return 1;
+        """
     def onExecuteAjaxCommand(self,state):
         if state=="success":
             return u"""

setup.py

@@ -66,7 +66,7 @@ if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
         file_info[0] = '\\PURELIB\\%s' % file_info[0]
 
 # Dynamically calculate the version based on django.VERSION.
-version = "1.4.143"
+version = "1.5.143"
 
 setup(
     name = "DjangoUeditor",