chiliproject_side_by_side_wiki_edit 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.1.1 2012-12-06
+
+* 1 enhancement:
+  * Layout is now managed by toggling classes on elements instead of
+    overriding styles inline through javascript
+
+* 1 bug fix:
+  * The plugin is now also enabled when creating new wiki pages
+
 === 0.1.0 2012-09-28
 
 * 1 major enhancement:

data/assets/javascripts/side_by_side_edit.js

@@ -1,20 +1,19 @@
-jQuery(function() {
-  var $ = jQuery;
+jQuery(function($) {
   var editor = $('textarea.wiki-edit');
+  var editor_parent = editor.parentsUntil('p').parent();
   var preview = $('div#preview');
   var preview_link = $('input[name=commit]').next();
 
-  var disable = function() {
-    editor.parentsUntil('p').parent().removeAttr('style');
-    preview.removeAttr('style');
+  var disable_side_by_side_mode = function() {
+    editor_parent.add(preview).removeClass('side_by_side');
+    editor.off('scroll');
     $('#content').append(preview);
   };
 
-  var enable = function() {
-    var editorParent = editor.parentsUntil('p').parent();
+  var enable_side_by_side_mode = function() {
+    editor_parent.add(preview).addClass('side_by_side');
 
-    editorParent.css('width', '49%').before(preview);
-    preview.css({ 'float': 'right', 'width': '49%', 'margin-top': '5ex', 'overflow-y': 'scroll' });
+    editor_parent.before(preview);
     preview.height(editor.height() + 5);
 
     editor.scroll(preview, scroll_preview);
@@ -30,17 +29,17 @@ jQuery(function() {
     var target = $(event.data);
 
     target.scrollTop(source_position * (target[0].scrollHeight - target.innerHeight()));
-  }
+  };
 
-  var toggle_mode = function() {
+  var toggle_side_by_side_mode = function() {
     if(this.checked) {
-      enable();
+      enable_side_by_side_mode();
     } else {
-      disable();
+      disable_side_by_side_mode();
     }
-  }
+  };
 
   preview_link.after($('<label for="side_by_side_mode">Show editor and preview side-by-side</label>'))
               .after($('<input id="side_by_side_mode" type="checkbox" />'));
-  $('#side_by_side_mode').on('click', toggle_mode);
+  $('#side_by_side_mode').click(toggle_side_by_side_mode);
 });

data/assets/stylesheets/side_by_side_edit.css

@@ -0,0 +1,9 @@
+.side_by_side {
+  width: 49.5%;
+}
+
+#preview.side_by_side {
+  float: right;
+  margin-top: 5ex;
+  overflow-y: scroll;
+}

data/lib/chiliproject_side_by_side_wiki_edit/hooks/view_wiki_edit_hook.rb

@@ -2,10 +2,25 @@ module ChiliprojectSideBySideWikiEdit
   module Hooks
     class ViewWikiEditHook < Redmine::Hook::ViewListener
       def view_layouts_base_html_head(context = {})
-        if context[:controller] && context[:controller].is_a?(WikiController) && (context[:controller].action_name == 'edit')
-          javascript_include_tag '/plugin_assets/chiliproject_side_by_side_wiki_edit/javascripts/side_by_side_edit.js'
+        if wiki_controller?(context) && extendable_action?(context)
+          asset_path = '/plugin_assets/chiliproject_side_by_side_wiki_edit'
+          [
+            javascript_include_tag("#{asset_path}/javascripts/side_by_side_edit.js"),
+            stylesheet_link_tag("#{asset_path}/stylesheets/side_by_side_edit.css")
+          ]
         end
       end
+
+      def extendable_action?(context)
+        # For some reason ChiliProject uses the show action instead of the new
+        # action to create new wiki pages. This does mean that the javascript
+        # and stylesheets get loaded on regular wiki pages as well
+        context[:controller] && ['show', 'edit'].include?(context[:controller].action_name)
+      end
+
+      def wiki_controller?(context)
+        context[:controller] && context[:controller].is_a?(WikiController)
+      end
     end
   end
 end

data/lib/chiliproject_side_by_side_wiki_edit/version.rb

@@ -1,3 +1,3 @@
 module ChiliprojectSideBySideWikiEdit
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/tasks/chiliproject_side_by_side_wiki_edit_tasks.rb

@@ -3,10 +3,6 @@ require 'rake/tasklib'
 
 class ChiliprojectSideBySideWikiEditTasks < Rake::TaskLib
   def initialize
-    define
-  end
-
-  def define
     namespace :chiliproject_side_by_side_wiki_edit do
       desc "Install ChiliprojectSideBySideWikiEdit plugin (include assets, etc)"
       task :install => [:symlink_assets]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chiliproject_side_by_side_wiki_edit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies: []
 description: Allows side by side editor/preview functionality for ChiliProject wiki
   pages
@@ -27,6 +27,7 @@ files:
 - README.md
 - Rakefile
 - assets/javascripts/side_by_side_edit.js
+- assets/stylesheets/side_by_side_edit.css
 - chiliproject_side_by_side_wiki_edit.gemspec
 - init.rb
 - lib/chiliproject_side_by_side_wiki_edit.rb
@@ -48,7 +49,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1310505938391298615
+      hash: 1742587861404646340
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1310505938391298615
+      hash: 1742587861404646340
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23