EDIT / kanjai · Commits

Commit d9dc4aaee80c9c0b9277a5f6b2ffd81093f441ac

Authored by Karpikau Andrei
1 parent e0dcb16f

change kanjai version

Inline Side-by-side
Showing 5 changed files with 310 additions and 153 deletions
... ... @@ -54,25 +54,27 @@
54 54 <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
55 55 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
56 56 <provider selected="true" editor-type-id="text-editor">
57   - <state vertical-scroll-proportion="0.0" vertical-offset="3195" max-vertical-offset="7155">
58   - <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
  57 + <state vertical-scroll-proportion="-6.3703704" vertical-offset="3038" max-vertical-offset="6870">
  58 + <caret line="214" column="23" selection-start-line="214" selection-start-column="4" selection-end-line="214" selection-end-column="23" />
59 59 <folding>
60   - <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
61   - <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
62   - <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
63   - <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
64   - <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
  60 + <marker date="1469178571000" expanded="true" signature="1842:1884" placeholder="..." />
  61 + <marker date="1469178571000" expanded="true" signature="4089:4107" placeholder="..." />
  62 + <marker date="1469178571000" expanded="true" signature="4121:4139" placeholder="..." />
  63 + <marker date="1469178571000" expanded="true" signature="4191:4201" placeholder="..." />
  64 + <marker date="1469178571000" expanded="true" signature="4228:4291" placeholder="..." />
65 65 </folding>
66 66 </state>
67 67 </provider>
68 68 </entry>
69 69 </file>
70   - <file leaf-file-name="admin_extend.js" pinned="false" current-in-tab="false">
71   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
  70 + <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
  71 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
72 72 <provider selected="true" editor-type-id="text-editor">
73   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
74   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
75   - <folding />
  73 + <state vertical-scroll-proportion="0.0" vertical-offset="1766" max-vertical-offset="8535">
  74 + <caret line="152" column="59" selection-start-line="152" selection-start-column="59" selection-end-line="152" selection-end-column="59" />
  75 + <folding>
  76 + <marker date="1469178590000" expanded="true" signature="503:515" placeholder="..." />
  77 + </folding>
76 78 </state>
77 79 </provider>
78 80 </entry>
... ... @@ -97,56 +99,21 @@
97 99 </provider>
98 100 </entry>
99 101 </file>
100   - <file leaf-file-name="general_admin.js" pinned="false" current-in-tab="false">
101   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
  102 + <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
  103 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
102 104 <provider selected="true" editor-type-id="text-editor">
103   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
104   - <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="32" />
  105 + <state vertical-scroll-proportion="-6.0416665" vertical-offset="560" max-vertical-offset="1770">
  106 + <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
105 107 <folding />
106 108 </state>
107 109 </provider>
108 110 </entry>
109 111 </file>
110   - <file leaf-file-name="frontend.css.scss" pinned="false" current-in-tab="false">
111   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
112   - <provider selected="true" editor-type-id="text-editor">
113   - <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
114   - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
115   - <folding />
116   - </state>
117   - </provider>
118   - </entry>
119   - </file>
120   - <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
121   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
122   - <provider selected="true" editor-type-id="text-editor">
123   - <state vertical-scroll-proportion="0.0" vertical-offset="2183" max-vertical-offset="8265">
124   - <caret line="180" column="27" selection-start-line="168" selection-start-column="0" selection-end-line="180" selection-end-column="27" />
125   - <folding>
126   - <marker date="1469094078000" expanded="true" signature="503:515" placeholder="..." />
127   - </folding>
128   - </state>
129   - </provider>
130   - </entry>
131   - </file>
132   - <file leaf-file-name="general.js" pinned="false" current-in-tab="false">
133   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
134   - <provider selected="true" editor-type-id="text-editor">
135   - <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="135">
136   - <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
137   - <folding>
138   - <element signature="n#!!doc" expanded="true" />
139   - </folding>
140   - </state>
141   - </provider>
142   - </entry>
143   - </file>
144 112 </leaf>
145 113 </component>
146 114 <component name="IdeDocumentHistory">
147 115 <option name="CHANGED_PATHS">
148 116 <list>
149   - <option value="$PROJECT_DIR$/Gemfile.lock" />
150 117 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb" />
151 118 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb" />
152 119 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb" />
... ... @@ -190,12 +157,13 @@
190 157 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
191 158 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
192 159 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
193   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
194 160 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss" />
195   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
196 161 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
197 162 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
198 163 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
  164 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  165 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
  166 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
199 167 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
200 168 </list>
201 169 </option>
... ... @@ -294,6 +262,166 @@
294 262 <option name="myItemId" value="app" />
295 263 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
296 264 </PATH_ELEMENT>
  265 + <PATH_ELEMENT>
  266 + <option name="myItemId" value="views" />
  267 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  268 + </PATH_ELEMENT>
  269 + </PATH>
  270 + <PATH>
  271 + <PATH_ELEMENT>
  272 + <option name="myItemId" value="kanjai" />
  273 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  274 + </PATH_ELEMENT>
  275 + <PATH_ELEMENT>
  276 + <option name="myItemId" value="kanjai" />
  277 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  278 + </PATH_ELEMENT>
  279 + <PATH_ELEMENT>
  280 + <option name="myItemId" value="app" />
  281 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  282 + </PATH_ELEMENT>
  283 + <PATH_ELEMENT>
  284 + <option name="myItemId" value="views" />
  285 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  286 + </PATH_ELEMENT>
  287 + <PATH_ELEMENT>
  288 + <option name="myItemId" value="kanjai" />
  289 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  290 + </PATH_ELEMENT>
  291 + </PATH>
  292 + <PATH>
  293 + <PATH_ELEMENT>
  294 + <option name="myItemId" value="kanjai" />
  295 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  296 + </PATH_ELEMENT>
  297 + <PATH_ELEMENT>
  298 + <option name="myItemId" value="kanjai" />
  299 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  300 + </PATH_ELEMENT>
  301 + <PATH_ELEMENT>
  302 + <option name="myItemId" value="app" />
  303 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  304 + </PATH_ELEMENT>
  305 + <PATH_ELEMENT>
  306 + <option name="myItemId" value="views" />
  307 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  308 + </PATH_ELEMENT>
  309 + <PATH_ELEMENT>
  310 + <option name="myItemId" value="kanjai" />
  311 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  312 + </PATH_ELEMENT>
  313 + <PATH_ELEMENT>
  314 + <option name="myItemId" value="admin" />
  315 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  316 + </PATH_ELEMENT>
  317 + <PATH_ELEMENT>
  318 + <option name="myItemId" value="pages" />
  319 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  320 + </PATH_ELEMENT>
  321 + </PATH>
  322 + <PATH>
  323 + <PATH_ELEMENT>
  324 + <option name="myItemId" value="kanjai" />
  325 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  326 + </PATH_ELEMENT>
  327 + <PATH_ELEMENT>
  328 + <option name="myItemId" value="kanjai" />
  329 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  330 + </PATH_ELEMENT>
  331 + <PATH_ELEMENT>
  332 + <option name="myItemId" value="app" />
  333 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  334 + </PATH_ELEMENT>
  335 + <PATH_ELEMENT>
  336 + <option name="myItemId" value="views" />
  337 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  338 + </PATH_ELEMENT>
  339 + <PATH_ELEMENT>
  340 + <option name="myItemId" value="kanjai" />
  341 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  342 + </PATH_ELEMENT>
  343 + <PATH_ELEMENT>
  344 + <option name="myItemId" value="admin" />
  345 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  346 + </PATH_ELEMENT>
  347 + <PATH_ELEMENT>
  348 + <option name="myItemId" value="pages" />
  349 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  350 + </PATH_ELEMENT>
  351 + <PATH_ELEMENT>
  352 + <option name="myItemId" value="content_types" />
  353 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  354 + </PATH_ELEMENT>
  355 + </PATH>
  356 + <PATH>
  357 + <PATH_ELEMENT>
  358 + <option name="myItemId" value="kanjai" />
  359 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  360 + </PATH_ELEMENT>
  361 + <PATH_ELEMENT>
  362 + <option name="myItemId" value="kanjai" />
  363 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  364 + </PATH_ELEMENT>
  365 + <PATH_ELEMENT>
  366 + <option name="myItemId" value="app" />
  367 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  368 + </PATH_ELEMENT>
  369 + <PATH_ELEMENT>
  370 + <option name="myItemId" value="views" />
  371 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  372 + </PATH_ELEMENT>
  373 + <PATH_ELEMENT>
  374 + <option name="myItemId" value="kanjai" />
  375 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  376 + </PATH_ELEMENT>
  377 + <PATH_ELEMENT>
  378 + <option name="myItemId" value="admin" />
  379 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  380 + </PATH_ELEMENT>
  381 + </PATH>
  382 + <PATH>
  383 + <PATH_ELEMENT>
  384 + <option name="myItemId" value="kanjai" />
  385 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  386 + </PATH_ELEMENT>
  387 + <PATH_ELEMENT>
  388 + <option name="myItemId" value="kanjai" />
  389 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  390 + </PATH_ELEMENT>
  391 + <PATH_ELEMENT>
  392 + <option name="myItemId" value="app" />
  393 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  394 + </PATH_ELEMENT>
  395 + <PATH_ELEMENT>
  396 + <option name="myItemId" value="views" />
  397 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  398 + </PATH_ELEMENT>
  399 + <PATH_ELEMENT>
  400 + <option name="myItemId" value="kanjai" />
  401 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  402 + </PATH_ELEMENT>
  403 + <PATH_ELEMENT>
  404 + <option name="myItemId" value="admin" />
  405 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  406 + </PATH_ELEMENT>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="page_contents" />
  409 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  410 + </PATH_ELEMENT>
  411 + </PATH>
  412 + <PATH>
  413 + <PATH_ELEMENT>
  414 + <option name="myItemId" value="kanjai" />
  415 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  416 + </PATH_ELEMENT>
  417 + <PATH_ELEMENT>
  418 + <option name="myItemId" value="kanjai" />
  419 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  420 + </PATH_ELEMENT>
  421 + <PATH_ELEMENT>
  422 + <option name="myItemId" value="app" />
  423 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  424 + </PATH_ELEMENT>
297 425 </PATH>
298 426 <PATH>
299 427 <PATH_ELEMENT>
... ... @@ -369,6 +497,36 @@
369 497 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
370 498 </PATH_ELEMENT>
371 499 </PATH>
  500 + <PATH>
  501 + <PATH_ELEMENT>
  502 + <option name="myItemId" value="kanjai" />
  503 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  504 + </PATH_ELEMENT>
  505 + <PATH_ELEMENT>
  506 + <option name="myItemId" value="kanjai" />
  507 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  508 + </PATH_ELEMENT>
  509 + <PATH_ELEMENT>
  510 + <option name="myItemId" value="app" />
  511 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  512 + </PATH_ELEMENT>
  513 + <PATH_ELEMENT>
  514 + <option name="myItemId" value="assets" />
  515 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  516 + </PATH_ELEMENT>
  517 + <PATH_ELEMENT>
  518 + <option name="myItemId" value="javascripts" />
  519 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  520 + </PATH_ELEMENT>
  521 + <PATH_ELEMENT>
  522 + <option name="myItemId" value="kanjai" />
  523 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  524 + </PATH_ELEMENT>
  525 + <PATH_ELEMENT>
  526 + <option name="myItemId" value="admin" />
  527 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  528 + </PATH_ELEMENT>
  529 + </PATH>
372 530 </subPane>
373 531 </pane>
374 532 <pane id="RailsProjectView" />
... ... @@ -561,22 +719,22 @@
561 719 <layout>
562 720 <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
563 721 <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="7" side_tool="false" content_ui="tabs" />
564   - <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" />
565 722 <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" />
566   - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
567   - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
568   - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4450727" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
569   - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
  723 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  724 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
570 725 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
  726 + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
571 727 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  728 + <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" />
  729 + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  730 + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  731 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4450727" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  732 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
572 733 <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" />
573 734 <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" />
574   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
575 735 <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" />
576   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
577 736 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
578 737 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
579   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
580 738 <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" />
581 739 <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" />
582 740 </layout>
... ... @@ -884,34 +1042,12 @@
884 1042 </state>
885 1043 </provider>
886 1044 </entry>
887   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
888   - <provider selected="true" editor-type-id="text-editor">
889   - <state vertical-scroll-proportion="0.0" vertical-offset="1025" max-vertical-offset="1770">
890   - <caret line="89" column="88" selection-start-line="89" selection-start-column="88" selection-end-line="89" selection-end-column="88" />
891   - <folding />
892   - </state>
893   - </provider>
894   - </entry>
895 1045 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
896 1046 <provider selected="true" editor-type-id="text-editor">
897 1047 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
898 1048 <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
899 1049 <folding>
900   - <element signature="n#!!doc" expanded="true" />
901   - </folding>
902   - </state>
903   - </provider>
904   - </entry>
905   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
906   - <provider selected="true" editor-type-id="text-editor">
907   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7155">
908   - <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
909   - <folding>
910   - <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
911   - <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
912   - <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
913   - <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
914   - <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
  1050 + <element signature="n#!!doc" expanded="false" />
915 1051 </folding>
916 1052 </state>
917 1053 </provider>
... ... @@ -924,16 +1060,6 @@
924 1060 </state>
925 1061 </provider>
926 1062 </entry>
927   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
928   - <provider selected="true" editor-type-id="text-editor">
929   - <state vertical-scroll-proportion="0.0" vertical-offset="2183" max-vertical-offset="8265">
930   - <caret line="180" column="27" selection-start-line="168" selection-start-column="0" selection-end-line="180" selection-end-column="27" />
931   - <folding>
932   - <marker date="1469094078000" expanded="true" signature="503:515" placeholder="..." />
933   - </folding>
934   - </state>
935   - </provider>
936   - </entry>
937 1063 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
938 1064 <provider selected="true" editor-type-id="text-editor">
939 1065 <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
... ... @@ -980,6 +1106,38 @@
980 1106 </state>
981 1107 </provider>
982 1108 </entry>
  1109 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  1110 + <provider selected="true" editor-type-id="text-editor">
  1111 + <state vertical-scroll-proportion="-6.0416665" vertical-offset="560" max-vertical-offset="1770">
  1112 + <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
  1113 + <folding />
  1114 + </state>
  1115 + </provider>
  1116 + </entry>
  1117 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  1118 + <provider selected="true" editor-type-id="text-editor">
  1119 + <state vertical-scroll-proportion="-6.3703704" vertical-offset="3038" max-vertical-offset="6870">
  1120 + <caret line="214" column="23" selection-start-line="214" selection-start-column="4" selection-end-line="214" selection-end-column="23" />
  1121 + <folding>
  1122 + <marker date="1469178571000" expanded="true" signature="1842:1884" placeholder="..." />
  1123 + <marker date="1469178571000" expanded="true" signature="4089:4107" placeholder="..." />
  1124 + <marker date="1469178571000" expanded="true" signature="4121:4139" placeholder="..." />
  1125 + <marker date="1469178571000" expanded="true" signature="4191:4201" placeholder="..." />
  1126 + <marker date="1469178571000" expanded="true" signature="4228:4291" placeholder="..." />
  1127 + </folding>
  1128 + </state>
  1129 + </provider>
  1130 + </entry>
  1131 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  1132 + <provider selected="true" editor-type-id="text-editor">
  1133 + <state vertical-scroll-proportion="0.0" vertical-offset="1766" max-vertical-offset="8535">
  1134 + <caret line="152" column="59" selection-start-line="152" selection-start-column="59" selection-end-line="152" selection-end-column="59" />
  1135 + <folding>
  1136 + <marker date="1469178590000" expanded="true" signature="503:515" placeholder="..." />
  1137 + </folding>
  1138 + </state>
  1139 + </provider>
  1140 + </entry>
983 1141 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
984 1142 <provider selected="true" editor-type-id="text-editor">
985 1143 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.52)
  4 + kanjai (0.0.53)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -212,6 +212,11 @@ var initAjaxFileUpload = function(selector){
212 212 return this;
213 213 };
214 214
  215 +var clearAjaxFileUpload = function(selector){
  216 + selector.find('.ajax-file-upload-form').unbind('submit', addFileForAjaxUpload);
  217 +};
  218 +
  219 +
215 220
216 221 jQuery(document).ready(function(){
217 222
... ... @@ -440,30 +445,6 @@ jQuery(document).ready(function(){
440 445
441 446 });
442 447
443   - $(document).on('change','.content-type', function(){
444   - var $this = $(this),
445   - content_type = $this.val(),
446   - show_content_url = $this.data('show_content_url')
447   -
448   - jQuery.ajax({
449   - type: 'POST',
450   - url: show_content_url,
451   - data: {content_type: content_type},
452   - success: function (data) {
453   - $('#page_content_form').html(data);
454   -
455   - if($('#page_content_form .page_html_content').length > 0) {
456   - $('#page_content_form .page_html_content').froalaEditor({
457   - theme: 'gray',
458   - height: 400,
459   - toolbarButtons: ['underline', 'fontFamily', 'fontSize', 'color', 'paragraphStyle', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'outdent', 'indent', 'quote', 'insertHR', 'insertLink', 'cms-image', 'insertTable', 'undo', 'redo', 'clearFormatting', 'html', 'fullscreen']
460   - });
461   - }
462   -
463   - }
464   - });
465   - });
466   -
467 448
468 449
469 450
... ...
... ... @@ -125,6 +125,37 @@ jQuery(document).ready(function(){
125 125 return false;
126 126 });
127 127
  128 + initializeFieldForm = function($selector){
  129 + if($selector.find('#page_content_form .page_html_content').length > 0) {
  130 + $selector.find('#page_content_form .page_html_content').froalaEditor({
  131 + theme: 'gray',
  132 + height: 400,
  133 + toolbarButtons: ['underline', 'fontFamily', 'fontSize', 'color', 'paragraphStyle', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'outdent', 'indent', 'quote', 'insertHR', 'insertLink', 'cms-image', 'insertTable', 'undo', 'redo', 'clearFormatting', 'html', 'fullscreen']
  134 + });
  135 + }
  136 +
  137 + $('#work_area .wait-layer').css('display', 'none');
  138 +
  139 + $selector.find(".fileupload-field").each(function(){
  140 + var $this = $(this),
  141 + $previewBlock = $this.next(),
  142 + options = {'showUpload':false};
  143 +
  144 + if($previewBlock) {
  145 + options['initialPreview'] = $previewBlock.html();
  146 + $previewBlock.remove();
  147 + }
  148 +
  149 +
  150 + $this.fileinput(options);
  151 + });
  152 +
  153 + clearAjaxFileUpload($('#work_area .editor-content'));
  154 + ajaxFileUpload = initAjaxFileUpload($('#work_area .editor-content'));
  155 +
  156 +
  157 + };
  158 +
128 159 $('.html-generator').on('click', '.col-operation .col-content, .row-operation .col-content', function(){
129 160 var $this = $(this);
130 161
... ... @@ -147,40 +178,8 @@ jQuery(document).ready(function(){
147 178 $('#structure_area').slideUp('slow', function(){
148 179 $('#work_area .editor-content').html(data);
149 180
150   -
151   -
152 181 $('#work_area').slideDown('slow', function(){
153   - if($('#epiceditor').length > 0) {
154   - markdown_editor = new EpicEditor().load();
155   - }
156   -
157   - if($('#work_area .page_html_content').length > 0) {
158   - $('#work_area .page_html_content').froalaEditor({
159   - theme: 'gray',
160   - height: 400,
161   - toolbarButtons: ['underline', 'fontFamily', 'fontSize', 'color', 'paragraphStyle', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'outdent', 'indent', 'quote', 'insertHR', 'insertLink', 'cms-image', 'insertTable', 'undo', 'redo', 'clearFormatting', 'html', 'fullscreen']
162   - });
163   - }
164   -
165   - ajaxFileUpload = initAjaxFileUpload($('#work_area .editor-content'));
166   -
167   - $('#work_area .wait-layer').css('display', 'none');
168   -
169   - $(".fileupload-field").each(function(){
170   - var $this = $(this),
171   - $previewBlock = $this.next(),
172   - options = {'showUpload':false};
173   -
174   - if($previewBlock) {
175   - options['initialPreview'] = $previewBlock.html();
176   - $previewBlock.remove();
177   - }
178   -
179   -
180   - $this.fileinput(options);
181   - });
182   -
183   -
  182 + initializeFieldForm($('#page_content_form'));
184 183 });
185 184 });
186 185 }
... ... @@ -189,6 +188,25 @@ jQuery(document).ready(function(){
189 188 return false;
190 189 });
191 190
  191 + $(document).on('change','.content-type', function(){
  192 + var $this = $(this),
  193 + content_type = $this.val(),
  194 + show_content_url = $this.data('show_content_url')
  195 +
  196 + jQuery.ajax({
  197 + type: 'POST',
  198 + url: show_content_url,
  199 + data: {content_type: content_type},
  200 + success: function (data) {
  201 + $('#page_content_form').html(data);
  202 + initializeFieldForm($('#page_content_form'));
  203 + }
  204 + });
  205 + });
  206 +
  207 +
  208 +
  209 +
192 210 $('.html-generator').on('ajax:success', '.content-form', function(evt, data, status, xhr){
193 211 $('#work_area').slideUp('slow', function(){
194 212 $('#work_area .editor-content').html('');
... ...
1 1 module Kanjai
2   - VERSION = "0.0.53"
  2 + VERSION = "0.0.54"
3 3 end
... ...