locomotive-aloha-rails 0.20.1.5 → 0.23.2.1

data/README.md

@@ -1,7 +1,7 @@
-Rails 3.1 Integration for Aloha Editor
+Rails 3.2 Integration for Aloha Editor
 =================================
 
-The `aloha-rails` gem integrates the [AlohaEditor](http://aloha-editor.org/) editor with the Rails 3.1 asset pipeline.
+The `aloha-rails` gem integrates the [AlohaEditor](http://aloha-editor.org/) editor with the Rails 3.2 asset pipeline.
 
 
 Instructions
@@ -9,7 +9,7 @@ Instructions
 
 **1. Add `aloha-rails` to your Gemfile**
 
-    gem 'aloha-rails'
+    gem 'locomotive-aloha-rails'
 
 Then run `bundle install`.
 
@@ -45,4 +45,4 @@ Contact
 
 Feel free to contact me at didier at nocoffee dot fr.
 
-Copyright (c) 2012 NoCoffee
+Copyright (c) 2013 NoCoffee

data/Rakefile

@@ -31,16 +31,21 @@ desc "Update Aloha Editor to version specified in lib/aloha/rails/version.rb"
 task :update => [ :fetch, :extract, :process ]
 
 task :fetch do
-  download("https://github.com/downloads/alohaeditor/Aloha-Editor/alohaeditor-#{Aloha::VERSION}.zip", "alohaeditor.zip")
+  download("https://github.com/alohaeditor/Aloha-Editor/archive/alohaeditor-#{Aloha::VERSION}.zip", "alohaeditor.zip")
 end
 
 task :extract do
   step "Extracting core files" do
     `rm -rf tmp/aloha`
     `unzip -u tmp/alohaeditor.zip -d tmp`
+    `mv tmp/Aloha-Editor-alohaeditor-#{Aloha::VERSION}/src tmp/aloha`
+    `rm -rf tmp/Aloha-Editor-alohaeditor-#{Aloha::VERSION}`
 
-    %w(build.txt package.json plugins/extra/browser/css/browsercombined.css.backup).each { |file| `rm tmp/aloha/#{file}` }
-    %w(demo test plugins/extra/speak plugins/extra/flag-icons plugins/extra/googletranslate plugins/extra/wai-lang plugins/extra/zemanta).each { |folder| `rm -rf tmp/aloha/#{folder}` }
+    %w(package.json).each { |file| `rm tmp/aloha/#{file}` }
+    %w(demo test plugins/extra/speak plugins/extra/flag-icons plugins/extra/googletranslate plugins/extra/wai-lang plugins/extra/zemanta plugins/extra/proxy).each { |folder| `rm -rf tmp/aloha/#{folder}` }
+    %w(1.5.1 1.6.1 1.6 1.7.1).each { |version| `rm tmp/aloha/lib/vendor/jquery-#{version}.js` }
+    Dir['tmp/aloha/**/demo'].each { |file| `rm -rf #{file}` if File.directory?(file) }
+    Dir['tmp/aloha/**/test'].each { |file| `rm -rf #{file}` if File.directory?(file) }
 
     `rm -rf vendor/assets/javascripts/aloha`
     `mkdir -p vendor/assets/javascripts/aloha`
@@ -50,11 +55,15 @@ end
 
 task :process do
   step "Fixing file encoding" do
-    require 'iconv'
-    converter = Iconv.new('UTF-8', 'ISO-8859-1')
     Dir["vendor/assets/javascripts/aloha/**/*.js"].each do |file|
-      contents = converter.iconv(File.read(file)).force_encoding('UTF-8')
+      contents = File.read(file).encode('UTF-8', 'ISO-8859-1')
       File.open(file, 'w') { |f| f.write(contents) }
     end
   end
+  step "Wrong color in the aloha.css file" do
+    file = 'vendor/assets/javascripts/aloha/css/aloha.css'
+    content = File.read(file)
+    content.gsub!('#NaNbbaaNaN00NaN00NaN00NaN00NaN', '#000')
+    File.open(file, 'w') { |f| f.write(content) }
+  end
 end

data/app/assets/javascripts/aloha.js

@@ -1,2 +1,3 @@
 //= require aloha/preinit.js
+//= require aloha/lib/require.js
 //= require aloha/lib/aloha.js

data/lib/aloha/rails/engine.rb

@@ -2,7 +2,7 @@ module Aloha
   module Rails
     class Engine < ::Rails::Engine
       initializer 'precompile', :group => :all do |app|
-        app.config.assets.precompile << 'aloha.js'
+        app.config.assets.precompile += ['aloha.js', 'aloha/css/aloha.css']
       end
     end
   end

data/lib/aloha/rails/version.rb

@@ -1,7 +1,7 @@
 module Aloha
-  VERSION   = '0.20.10'
+  VERSION   = '0.23.2'
 
   module Rails
-    VERSION = '0.20.1.5'
+    VERSION = '0.23.2.1'
   end
 end

data/vendor/assets/javascripts/aloha/css/aloha-common-extra.css

@@ -0,0 +1,24 @@
+/* This file should only contain import statements, only one each for
+ * the core and plugins, so that it is easy to make variations of this
+ * file that exclude some plugins.
+ */
+@import "aloha-core.css";
+@import "../plugins/common/abbr/css/abbr.css";
+@import "../plugins/common/ui/css/ui.css";
+@import "../plugins/common/link/css/link.css";
+@import "../plugins/common/characterpicker/css/characterpicker.css";
+@import "../plugins/common/highlighteditables/css/highlighteditables.css";
+@import "../plugins/common/horizontalruler/css/horizontalruler.css";
+@import "../plugins/common/block/css/block.css";
+@import "../plugins/common/align/css/align.css";
+@import "../plugins/common/image/css/image.css";
+@import "../plugins/common/table/css/table.css";
+@import "../plugins/extra/cite/css/cite.css";
+@import "../plugins/extra/formatlesspaste/css/formatless.css";
+@import "../plugins/extra/wai-lang/css/wai-lang.css";
+@import	"../plugins/extra/numerated-headers/css/numerated-headers.css";
+@import "../plugins/extra/ribbon/css/ribbon.css";
+@import "../plugins/extra/headerids/css/headerids.css";
+@import "../plugins/extra/metaview/css/metaview.css";
+@import "../plugins/extra/textcolor/css/textcolor.css";
+

data/vendor/assets/javascripts/aloha/css/aloha-core.css

@@ -1,3 +1,7 @@
+@import "aloha-reset.css";
+@import "aloha-sidebar.css";
+@import "../lib/vendor/repository-browser/css/repository-browser.css";
+
 .aloha-editable {
 	min-height: 1.2em;
 	outline: none;
@@ -7,35 +11,6 @@
 	background: #80B5F2;
 	color: white;
 }
-.aloha-editable-zerowidthfix {
-	padding: 0px 5px 0px 5px !important;
-}
-
-
-
-.aloha-logo {
-	width:37px !important;
-	height:25px !important;
-	background-image: url('../img/gentics-logo.png') !important;
-}
-.aloha-maximize {
-	background-image: url('../img/gentics-logo.png') !important;
-}
-.aloha-fade-out {
-	background-image: url('../img/fade-out.png') !important;
-	width:20px !important;
-	height:20px !important;
-}
-.aloha-fade-in {
-	background-image: url('../img/fade-in.png') !important;
-	width:20px !important;
-	height:20px !important;
-}
-.aloha-maximize {
-	width:20px !important;
-	height:20px !important;
-	background-image: url('../img/maximize.png') !important;
-}
 .aloha-textarea {
 	overflow: hidden;
 	border:1px solid #ccc;

data/vendor/assets/javascripts/aloha/css/aloha-reset.css

@@ -0,0 +1,24 @@
+/**
+ * Aloha CSS reset.
+ * Original by Eric Meyer. Modified for use in Aloha.
+ * Every element used in the Aloha Editor UI should have a an appropriate reset here.
+ */
+
+/* http://meyerweb.com/eric/tools/css/reset/ 
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+.aloha div, .aloha span, .aloha button, .aloha a, .aloha img,
+.aloha ol, .aloha ul, .aloha li, .aloha label {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+.aloha ol, .aloha ul {
+	list-style: none;
+}

data/vendor/assets/javascripts/aloha/css/aloha-sidebar.css

@@ -7,10 +7,9 @@
 	font-family: Arial, sans-serif;
 	font-size: 12px;
 	border-right: 1px solid #888;
-	-moz-box-shadow:	0px 0px 10px rgba(0, 0, 0, .5);
-	-webkit-box-shadow:	0px 0px 10px rgba(0, 0, 0, .5);
-	box-shadow:			0px 0px 10px rgba(0, 0, 0, .5);
-	
+	-moz-box-shadow:    0px 0px 10px rgba(0, 0, 0, .5);
+	-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, .5);
+	box-shadow:         0px 0px 10px rgba(0, 0, 0, .5);
 }
 .aloha-sidebar-bar.aloha-sidebar-right {
 	left: auto;
@@ -42,17 +41,17 @@
 	padding: 0 15px;
 }
 .aloha-sidebar-panel-top {
-	-webkit-border-top-left-radius:	 5px;
+	-webkit-border-top-left-radius:  5px;
 	-webkit-border-top-right-radius: 5px;
-	-moz-border-radius-topleft:		 5px;
-	-moz-border-radius-topright:	 5px;
+	-moz-border-radius-topleft:      5px;
+	-moz-border-radius-topright:     5px;
 }
 .aloha-sidebar-panel-content.aloha-sidebar-panel-bottom {
 	padding-bottom: 0;
-	-webkit-border-bottom-left-radius:	5px;
-	-webkit-border-bottom-right-radius:	5px;
-	-moz-border-radius-bottomleft:		5px;
-	-moz-border-radius-bottomright:		5px;
+	-webkit-border-bottom-left-radius:  5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-moz-border-radius-bottomleft:      5px;
+	-moz-border-radius-bottomright:     5px;
 	border-bottom-width: 1px;
 }
 .aloha-sidebar-panel-title {
@@ -63,26 +62,25 @@
 	border-bottom-width: 0;
 	background-color: #303539;
 	background-image: -webkit-gradient(
-    	linear,
-    	center top,
-    	center bottom,
-    	color-stop(0.00, #6c6f74),
-    	color-stop(0.05, #4c4f54),
-    	color-stop(0.10, #3f4448),
-    	color-stop(0.45, #383d41),
-    	color-stop(0.50, #303539),
-    	color-stop(0.95, #33363b)
+		linear,
+		center top,
+		center bottom,
+		color-stop(0.00, #6c6f74),
+		color-stop(0.05, #4c4f54),
+		color-stop(0.10, #3f4448),
+		color-stop(0.45, #383d41),
+		color-stop(0.50, #303539),
+		color-stop(0.95, #33363b)
 	);
 	background-image: -moz-linear-gradient(
-    	center top,
+		center top,
 		#6c6f74 0%,
 		#4c4f54 5%,
 		#3f4448 10%,
-    	#383d41 45%,
-    	#303539 50%,
-    	#33363b 95%
+		#383d41 45%,
+		#303539 50%,
+		#33363b 95%
 	);
-	
 	color: #ccc;
 	cursor: pointer;
 	font-size: 13px;
@@ -101,11 +99,9 @@
 	height: 16px;
 	background: url(../img/arrow.png) no-repeat center center;
 	opacity: 0.3;
-	
 }
 .aloha-sidebar-panel-title:hover .aloha-sidebar-panel-title-arrow {
 	opacity: 0.9;
-	
 }
 .aloha-sidebar-panel-title .aloha-sidebar-panel-title-arrow.aloha-sidebar-panel-title-arrow-down {
 	background-image: url(../img/arrow-down.png);
@@ -146,58 +142,55 @@
 	width: 40px;
 	height: 30px;
 	overflow: hidden;
-	
 	background-color: #303539;
 	background-image: -webkit-gradient(
-    	linear,
-    	center top,
-    	center bottom,
-    	color-stop(0.00, #6c6f74),
-    	color-stop(0.05, #4c4f54),
-    	color-stop(0.10, #3f4448),
-    	color-stop(0.45, #383d41),
-    	color-stop(0.50, #303539),
-    	color-stop(0.95, #33363b)
+		linear,
+		center top,
+		center bottom,
+		color-stop(0.00, #6c6f74),
+		color-stop(0.05, #4c4f54),
+		color-stop(0.10, #3f4448),
+		color-stop(0.45, #383d41),
+		color-stop(0.50, #303539),
+		color-stop(0.95, #33363b)
 	);
 	background-image: -moz-linear-gradient(
-    	center top,
+		center top,
 		#6c6f74 0%,
 		#4c4f54 5%,
 		#3f4448 10%,
-    	#383d41 45%,
-    	#303539 50%,
-    	#33363b 95%
+		#383d41 45%,
+		#303539 50%,
+		#33363b 95%
 	);
-	
-	
 	cursor: pointer;
-	
-	-moz-box-shadow:	0px 0px 10px rgba(0, 0, 0, .5);
-	-webkit-box-shadow:	0px 0px 10px rgba(0, 0, 0, .5);
-	box-shadow:			0px 0px 10px rgba(0, 0, 0, .5);
-	
-	border-top-right-radius:	 		5px;
-	border-bottom-right-radius:	 		5px;
-	-moz-border-radius-topright: 		5px;
-	-moz-border-radius-bottomright: 	5px;
-	-webkit-border-top-right-radius: 	5px;
+
+	-moz-box-shadow:    0px 0px 10px rgba(0, 0, 0, .5);
+	-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, .5);
+	box-shadow:         0px 0px 10px rgba(0, 0, 0, .5);
+
+	border-top-right-radius:            5px;
+	border-bottom-right-radius:         5px;
+	-moz-border-radius-topright:        5px;
+	-moz-border-radius-bottomright:     5px;
+	-webkit-border-top-right-radius:    5px;
 	-webkit-border-bottom-right-radius: 5px;
 }
 .aloha-sidebar-right .aloha-sidebar-handle {
 	left: -30px;
-	border-top-right-radius:	 		0px;
-	border-bottom-right-radius:	 		0px;
-	-moz-border-radius-topright: 		0px;
-	-moz-border-radius-bottomright: 	0px;
-	-webkit-border-top-right-radius: 	0px;
+	border-top-right-radius:            0px;
+	border-bottom-right-radius:         0px;
+	-moz-border-radius-topright:        0px;
+	-moz-border-radius-bottomright:     0px;
+	-webkit-border-top-right-radius:    0px;
 	-webkit-border-bottom-right-radius: 0px;
-	
-	border-top-left-radius:	 			5px;
-	border-bottom-left-radius:	 		5px;
-	-moz-border-radius-topleft: 		5px;
-	-moz-border-radius-bottomleft: 		5px;
-	-webkit-border-top-left-radius: 	5px;
-	-webkit-border-bottom-left-radius:	5px;
+
+	border-top-left-radius:             5px;
+	border-bottom-left-radius:          5px;
+	-moz-border-radius-topleft:         5px;
+	-moz-border-radius-bottomleft:      5px;
+	-webkit-border-top-left-radius:     5px;
+	-webkit-border-bottom-left-radius:  5px;
 }
 .aloha-sidebar-handle-icon {
 	display: block;
@@ -208,7 +201,6 @@
 	width: 20px;
 	height: 20px;
 	opacity: 0.5;
-	
 }
 .aloha-sidebar-right .aloha-sidebar-handle-icon {
 	left: 5px;
@@ -220,26 +212,25 @@
 .aloha-sidebar-panel-parent-path {
 	background-color: #303539;
 	background-image: -webkit-gradient(
-    	linear,
-    	center top,
-    	center bottom,
-    	color-stop(0.00, #6c6f74),
-    	color-stop(0.05, #4c4f54),
-    	color-stop(0.10, #3f4448),
-    	color-stop(0.45, #383d41),
-    	color-stop(0.50, #303539),
-    	color-stop(0.95, #33363b)
+		linear,
+		center top,
+		center bottom,
+		color-stop(0.00, #6c6f74),
+		color-stop(0.05, #4c4f54),
+		color-stop(0.10, #3f4448),
+		color-stop(0.45, #383d41),
+		color-stop(0.50, #303539),
+		color-stop(0.95, #33363b)
 	);
 	background-image: -moz-linear-gradient(
-    	center top,
+	center top,
 		#6c6f74 0%,
 		#4c4f54 5%,
 		#3f4448 10%,
-    	#383d41 45%,
-    	#303539 50%,
-    	#33363b 95%
+		#383d41 45%,
+		#303539 50%,
+		#33363b 95%
 	);
-	
 	color: #fff;
 	cursor: pointer;
 	font-size: 12px;
@@ -249,20 +240,17 @@
 }
 .aloha-sidebar-panel-parent-path:hover {
 	opacity: 0.9;
-	
 }
 .aloha-sidebar-panel-parent-path span {
 	display: inline-block;
 	padding: 0 10px 0 5px;
 	background: url(../img/breadcrumb-divider.png) no-repeat right center;
 	opacity: 0.25;
-	
 	line-height: 1.6em;
 }
 .aloha-sidebar-panel-parent-path span:first-child {
 	font-weight: bold;
 	opacity: 0.8;
-	
 }
 .aloha-sidebar-panel-parent-path span:last-child {
 	background: none;
@@ -270,14 +258,14 @@
 .aloha-sidebar-panel-parent-content {
 	padding: 4px;
 	background-image: -webkit-gradient(
-    	linear,
-    	center top,
-    	center bottom,
-    	color-stop(0.0, rgba(0, 0, 0, 0.25)),
-    	color-stop(0.05, rgba(0, 0, 0, 0.0))
+		linear,
+		center top,
+		center bottom,
+		color-stop(0.0, rgba(0, 0, 0, 0.25)),
+		color-stop(0.05, rgba(0, 0, 0, 0.0))
 	);
 	background-image: -moz-linear-gradient(
-    	center top,
+		center top,
 		rgba(0, 0, 0, 0.25) 0%,
 		rgba(0, 0, 0, 0.0) 5%
 	);