Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ExpertsInside/IronSP
base: 58072bcb72
...
head fork: ExpertsInside/IronSP
compare: 7a0ff670c2
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 15 files changed
  • 0 commit comments
  • 1 contributor
Showing with 81 additions and 304 deletions.
  1. +27 −27 src/IronSharePoint.IronRuby/TEMPLATE/Features/IronSP_IronRuby/ruby/1.9.1/irb/lc/ja/error.rb
  2. +41 −41 src/IronSharePoint.IronRuby/TEMPLATE/Features/IronSP_IronRuby/ruby/1.9.1/irb/lc/ja/help-message
  3. +1 −1  src/IronSharePoint/IronConsole/IronConsoleUserControl.ascx
  4. +3 −6 src/IronSharePoint/IronSharePoint.csproj
  5. +2 −2 src/IronSharePoint/Lists/IronHive/Repair.aspx
  6. +1 −1  src/IronSharePoint/Lists/IronHive/Upload.aspx
  7. +1 −1  src/IronSharePoint/Package/Package.package
  8. +3 −2 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint.rb
  9. +1 −2  src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/iron_view.rb
  10. 0  src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/{ → patches/core}/object.rb
  11. +0 −76 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/patches/haml.rb
  12. +0 −40 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/patches/i18n/backend/base.rb
  13. +0 −29 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/patches/i18n/i18n.rb
  14. +0 −75 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/sass_compiler.rb
  15. +1 −1  src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/version.rb
View
54 src/IronSharePoint.IronRuby/TEMPLATE/Features/IronSP_IronRuby/ruby/1.9.1/irb/lc/ja/error.rb
@@ -1,27 +1,27 @@
-# -*- coding: utf-8 -*-
-# irb/lc/ja/error.rb -
-# $Release Version: 0.9.6$
-# $Revision: 25189 $
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
-require "e2mmap"
-
-module IRB
- # exceptions
- extend Exception2MessageMapper
- def_exception :UnrecognizedSwitch, 'スイッチ(%s)が分りません'
- def_exception :NotImplementedError, '`%s\'の定義が必要です'
- def_exception :CantReturnToNormalMode, 'Normalモードに戻れません.'
- def_exception :IllegalParameter, 'パラメータ(%s)が間違っています.'
- def_exception :IrbAlreadyDead, 'Irbは既に死んでいます.'
- def_exception :IrbSwitchedToCurrentThread, 'カレントスレッドに切り替わりました.'
- def_exception :NoSuchJob, 'そのようなジョブ(%s)はありません.'
- def_exception :CantShiftToMultiIrbMode, 'multi-irb modeに移れません.'
- def_exception :CantChangeBinding, 'バインディング(%s)に変更できません.'
- def_exception :UndefinedPromptMode, 'プロンプトモード(%s)は定義されていません.'
-end
-# vim:fileencoding=utf-8
+# -*- coding: utf-8 -*-
+# irb/lc/ja/error.rb -
+# $Release Version: 0.9.6$
+# $Revision: 25189 $
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#
+#
+require "e2mmap"
+
+module IRB
+ # exceptions
+ extend Exception2MessageMapper
+ def_exception :UnrecognizedSwitch, 'スイッチ(%s)が分りません'
+ def_exception :NotImplementedError, '`%s\'の定義が必要です'
+ def_exception :CantReturnToNormalMode, 'Normalモードに戻れません.'
+ def_exception :IllegalParameter, 'パラメータ(%s)が間違っています.'
+ def_exception :IrbAlreadyDead, 'Irbは既に死んでいます.'
+ def_exception :IrbSwitchedToCurrentThread, 'カレントスレッドに切り替わりました.'
+ def_exception :NoSuchJob, 'そのようなジョブ(%s)はありません.'
+ def_exception :CantShiftToMultiIrbMode, 'multi-irb modeに移れません.'
+ def_exception :CantChangeBinding, 'バインディング(%s)に変更できません.'
+ def_exception :UndefinedPromptMode, 'プロンプトモード(%s)は定義されていません.'
+end
+# vim:fileencoding=utf-8
View
82 src/IronSharePoint.IronRuby/TEMPLATE/Features/IronSP_IronRuby/ruby/1.9.1/irb/lc/ja/help-message
@@ -1,41 +1,41 @@
-# -*- coding: utf-8 -*-
-# irb/lc/ja/help-message.rb -
-# $Release Version: 0.9.6$
-# $Revision: 27273 $
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
-#
-# --
-#
-#
-#
-Usage: irb.rb [options] [programfile] [arguments]
- -f ~/.irbrc を読み込まない.
- -m bcモード(分数, 行列の計算ができる)
- -d $DEBUG をtrueにする(ruby -d と同じ)
- -r load-module ruby -r と同じ.
- -I path $LOAD_PATH に path を追加する.
- -U ruby -U と同じ.
- -E enc ruby -E と同じ.
- -w ruby -w と同じ.
- -W[level=2] ruby -W と同じ.
- --inspect 結果出力にinspectを用いる(bcモード以外はデフォルト).
- --noinspect 結果出力にinspectを用いない.
- --readline readlineライブラリを利用する.
- --noreadline readlineライブラリを利用しない.
- --prompt prompt-mode/--prompt-mode prompt-mode
- プロンプトモードを切替えます. 現在定義されているプ
- ロンプトモードは, default, simple, xmp, inf-rubyが
- 用意されています.
- --inf-ruby-mode emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
- に指定がない限り, readlineライブラリは使わなくなる.
- --simple-prompt 非常にシンプルなプロンプトを用いるモードです.
- --noprompt プロンプト表示を行なわない.
- --tracer コマンド実行時にトレースを行なう.
- --back-trace-limit n
- バックトレース表示をバックトレースの頭から n, 後ろ
- からnだけ行なう. デフォルトは16
- --irb_debug n irbのデバッグデバッグレベルをnに設定する(利用しな
- い方が無難でしょう).
- -v, --version irbのバージョンを表示する
-
-# vim:fileencoding=utf-8
+# -*- coding: utf-8 -*-
+# irb/lc/ja/help-message.rb -
+# $Release Version: 0.9.6$
+# $Revision: 27273 $
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#
+#
+Usage: irb.rb [options] [programfile] [arguments]
+ -f ~/.irbrc を読み込まない.
+ -m bcモード(分数, 行列の計算ができる)
+ -d $DEBUG をtrueにする(ruby -d と同じ)
+ -r load-module ruby -r と同じ.
+ -I path $LOAD_PATH に path を追加する.
+ -U ruby -U と同じ.
+ -E enc ruby -E と同じ.
+ -w ruby -w と同じ.
+ -W[level=2] ruby -W と同じ.
+ --inspect 結果出力にinspectを用いる(bcモード以外はデフォルト).
+ --noinspect 結果出力にinspectを用いない.
+ --readline readlineライブラリを利用する.
+ --noreadline readlineライブラリを利用しない.
+ --prompt prompt-mode/--prompt-mode prompt-mode
+ プロンプトモードを切替えます. 現在定義されているプ
+ ロンプトモードは, default, simple, xmp, inf-rubyが
+ 用意されています.
+ --inf-ruby-mode emacsのinf-ruby-mode用のプロンプト表示を行なう. 特
+ に指定がない限り, readlineライブラリは使わなくなる.
+ --simple-prompt 非常にシンプルなプロンプトを用いるモードです.
+ --noprompt プロンプト表示を行なわない.
+ --tracer コマンド実行時にトレースを行なう.
+ --back-trace-limit n
+ バックトレース表示をバックトレースの頭から n, 後ろ
+ からnだけ行なう. デフォルトは16
+ --irb_debug n irbのデバッグデバッグレベルをnに設定する(利用しな
+ い方が無難でしょう).
+ -v, --version irbのバージョンを表示する
+
+# vim:fileencoding=utf-8
View
2  src/IronSharePoint/IronConsole/IronConsoleUserControl.ascx
@@ -1,5 +1,5 @@
<%@ Assembly Name="$SharePoint.Project.AssemblyFullName$" %>
-<%@ Assembly Name="Microsoft.Web.CommandUI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
+<%@ Assembly Name="Microsoft.Web.CommandUI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="IronConsoleUserControl.ascx.cs" Inherits="IronSharePoint.IronConsole.IronConsoleUserControl" %>
<%@ Import Namespace="Microsoft.SharePoint" %>
View
9 src/IronSharePoint/IronSharePoint.csproj
@@ -12,7 +12,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetOfficeVersion>15.0</TargetOfficeVersion>
<FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{BB1F664B-9266-4fd6-B973-E1E44974B511};{14822709-B5A1-4724-98CA-57A101D1B079};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <ProjectTypeGuids>{C1CDDADD-2546-481F-9697-4EA41081F2FC};{14822709-B5A1-4724-98CA-57A101D1B079};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SandboxedSolution>False</SandboxedSolution>
<TokenReplacementFileExtensions>ashx</TokenReplacementFileExtensions>
<SccProjectName>
@@ -44,6 +44,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <ProjectMode>SharePointCustomization</ProjectMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -92,6 +93,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files\Common Files\microsoft shared\Web Server Extensions\15\ISAPI\Microsoft.SharePoint.Security.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.SharePoint.WorkflowActions, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL" />
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
@@ -203,15 +205,10 @@
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\mixins\sp_context_accessors.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\mixins\type_registration.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\mixins\view_helpers.rb" />
- <None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\object.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\patches\core\string.rb" />
- <None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\patches\haml.rb" />
- <None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\patches\i18n\backend\base.rb" />
- <None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\patches\i18n\i18n.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\patches\log4r\logger.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\rescues\template_error.haml" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\rescues\template_not_found.haml" />
- <None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\sass_compiler.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\variation.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\version.rb" />
<None Include="TEMPLATE\Features\IronSP_Root\iron_sharepoint\view_helpers\date_helper.rb" />
View
4 src/IronSharePoint/Lists/IronHive/Repair.aspx
@@ -1,5 +1,5 @@
-<%@ Page language="C#" MasterPageFile="~masterurl/default.master" Inherits="Microsoft.SharePoint.WebPartPages.WebPartPage,Microsoft.SharePoint,Version=14.0.0.0,Culture=neutral,PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="SharePoint" Namespace="Microsoft.SharePoint.WebControls" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="Utilities" Namespace="Microsoft.SharePoint.Utilities" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Import Namespace="Microsoft.SharePoint" %> <%@ Assembly Name="Microsoft.Web.CommandUI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="WebPartPages" Namespace="Microsoft.SharePoint.WebPartPages" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
-<%@ Register Tagprefix="ApplicationPages" Namespace="Microsoft.SharePoint.ApplicationPages.WebControls" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
+<%@ Page language="C#" MasterPageFile="~masterurl/default.master" Inherits="Microsoft.SharePoint.WebPartPages.WebPartPage,Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="SharePoint" Namespace="Microsoft.SharePoint.WebControls" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="Utilities" Namespace="Microsoft.SharePoint.Utilities" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Import Namespace="Microsoft.SharePoint" %> <%@ Assembly Name="Microsoft.Web.CommandUI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="WebPartPages" Namespace="Microsoft.SharePoint.WebPartPages" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
+<%@ Register Tagprefix="ApplicationPages" Namespace="Microsoft.SharePoint.ApplicationPages.WebControls" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
<asp:Content ContentPlaceHolderId="PlaceHolderPageTitle" runat="server"><SharePoint:ListProperty Property="TitleOrFolder" runat="server"/> - <SharePoint:ListProperty Property="CurrentViewTitle" runat="server"/></asp:Content>
<asp:Content ContentPlaceHolderId="PlaceHolderPageTitleInTitleArea" runat="server">
<SharePoint:ListProperty Property="TitleBreadcrumb" runat="server"/>
View
2  src/IronSharePoint/Lists/IronHive/Upload.aspx
@@ -1,4 +1,4 @@
-<%@ Page language="C#" MasterPageFile="~masterurl/default.master" Inherits="Microsoft.SharePoint.WebPartPages.WebPartPage,Microsoft.SharePoint,Version=14.0.0.0,Culture=neutral,PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="SharePoint" Namespace="Microsoft.SharePoint.WebControls" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="Utilities" Namespace="Microsoft.SharePoint.Utilities" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Import Namespace="Microsoft.SharePoint" %> <%@ Assembly Name="Microsoft.Web.CommandUI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="WebPartPages" Namespace="Microsoft.SharePoint.WebPartPages" Assembly="Microsoft.SharePoint, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
+<%@ Page language="C#" MasterPageFile="~masterurl/default.master" Inherits="Microsoft.SharePoint.WebPartPages.WebPartPage,Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="SharePoint" Namespace="Microsoft.SharePoint.WebControls" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="Utilities" Namespace="Microsoft.SharePoint.Utilities" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Import Namespace="Microsoft.SharePoint" %> <%@ Assembly Name="Microsoft.Web.CommandUI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %> <%@ Register Tagprefix="WebPartPages" Namespace="Microsoft.SharePoint.WebPartPages" Assembly="Microsoft.SharePoint, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c" %>
<asp:Content ContentPlaceHolderId="PlaceHolderLeftNavBar" runat="server" >
<SharePoint:UIVersionedContent UIVersion="4" runat="server">
<ContentTemplate>
View
2  src/IronSharePoint/Package/Package.package
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<package xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="aacb7026-8941-4faa-b4bb-04562e317e53" solutionId="aacb7026-8941-4faa-b4bb-04562e317e53" resetWebServer="false" name="IronSharePoint" xmlns="http://schemas.microsoft.com/VisualStudio/2008/SharePointTools/PackageModel">
+<package xmlns:dm0="http://schemas.microsoft.com/VisualStudio/2008/DslTools/Core" dslVersion="1.0.0.0" Id="aacb7026-8941-4faa-b4bb-04562e317e53" solutionId="aacb7026-8941-4faa-b4bb-04562e317e53" resetWebServer="false" sharePointProductVersion="15.0" name="IronSharePoint" xmlns="http://schemas.microsoft.com/VisualStudio/2008/SharePointTools/PackageModel">
<assemblies>
<customAssembly location="Microsoft.Dynamic.dll" deploymentTarget="GlobalAssemblyCache" sourcePath="..\..\lib\Microsoft.Dynamic.dll" />
<customAssembly location="Microsoft.Scripting.dll" deploymentTarget="GlobalAssemblyCache" sourcePath="..\..\lib\Microsoft.Scripting.dll" />
View
5 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint.rb
@@ -1,5 +1,8 @@
require 'active_support'
require 'log4r'
+require 'haml'
+require 'slim'
+require 'tilt'
require 'iron_sharepoint/ext/log4r/outputter/iron_logs_outputter'
require 'iron_sharepoint/ext/log4r/outputter/iron_memory_outputter'
@@ -22,5 +25,3 @@
IRON_DEFAULT_LOGGER.error ex
end
end
-
-$: << IronSharePoint::IronConstant.IronHiveRoot
View
3  src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/iron_view.rb
@@ -1,7 +1,6 @@
-require 'haml'
-require 'tilt'
require 'iron_sharepoint/mixins/logging'
require 'iron_sharepoint/mixins/view_helpers'
+require 'active_support/core_ext/module/delegation'
module IronSharePoint
class IronView
View
0  ...TE/Features/IronSP_Root/iron_sharepoint/object.rb → ...ronSP_Root/iron_sharepoint/patches/core/object.rb
File renamed without changes
View
76 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/patches/haml.rb
@@ -1,76 +0,0 @@
-require 'haml'
-
-module Haml
- module Filters
- # Does not parse the filtered text.
- # This is useful for large blocks of text without HTML tags,
- # when you don't want lines starting with `.` or `-`
- # to be parsed.
- module Plain
- include Base
-
- # @see Base#render
- def render(text); text; end
- end
-
- # Surrounds the filtered text with `<script>` and CDATA tags.
- # Useful for including inline Javascript.
- module Javascript
- include Base
-
- # @see Base#render_with_options
- def render_with_options(text, options)
- <<END
-<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>
- //<![CDATA[
- #{text.to_clr_string.TrimEnd().Replace("\n", "\n ")}
- //]]>
-</script>
-END
- end
- end
-
- # Surrounds the filtered text with `<style>` and CDATA tags.
- # Useful for including inline CSS.
- module Css
- include Base
-
- # @see Base#render_with_options
- def render_with_options(text, options)
- <<END
-<style type=#{options[:attr_wrapper]}text/css#{options[:attr_wrapper]}>
- /*<![CDATA[*/
- #{text.to_clr_string.TrimEnd().Replace("\n", "\n ")}
- /*]]>*/
-</style>
-END
- end
- end
-
- # Surrounds the filtered text with CDATA tags.
- module Cdata
- include Base
-
- # @see Base#render
- def render(text)
- "<![CDATA[#{("\n" + text).to_clr_string.TrimEnd().Replace("\n", "\n ")}\n]]>"
- end
- end
- end
-
- module Precompiler
- alias_method :process_line_without_mustache, :process_line
-
- def process_line(text, index)
- if text =~ /^\{\{.*\}\}$/
- @index = index + 1
- push_merged_text(text, 1, true)
- concat_merged_text("\n")
- return
- else
- process_line_without_mustache(text, index)
- end
- end
- end
-end
-
View
40 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/patches/i18n/backend/base.rb
@@ -1,40 +0,0 @@
-require 'iron_sharepoint/patches/core/string'
-require 'i18n/backend/base'
-
-module I18n
- module Backend
- module Base
- protected
-
- def load_yml(filename)
- begin
- yaml = YAML::load(File.read filename)
- convert_to_utf8 yaml
- rescue TypeError
- nil
- rescue SyntaxError
- nil
- end
- end
-
- def convert_to_utf8 translation
- case translation
- when String, System::String
- bytes = System::Text::Encoding.Default.get_bytes translation
- bytes = System::Text::Encoding.convert(System::Text::Encoding.Default, System::Text::Encoding.UTF8, bytes)
- (System::Text::Encoding.UTF8.get_string(bytes)).to_s
- when Array
- translation.map do |x|
- convert_to_utf8 x
- end
- when Hash
- converted = {}
- translation.each do |k,v|
- converted[k] = convert_to_utf8 v
- end
- converted
- end
- end
- end
- end
-end
View
29 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/patches/i18n/i18n.rb
@@ -1,29 +0,0 @@
-require 'iron_sharepoint/variation'
-
-include IronSharePoint
-
-module I18n
- class << self
- def translate(*args)
- options = args.last.is_a?(Hash) ? args.pop : {}
- key = args.shift
- backend = config.backend
- sp_locale = IronSharePoint::Variation.current.to_sym
- locale = options.delete(:locale) || sp_locale
- handling = options.delete(:throw) && :throw || options.delete(:raise) && :raise # TODO deprecate :raise
-
- raise I18n::ArgumentError if key.is_a?(String) && key.empty?
-
- result = catch(:exception) do
- if key.is_a?(Array)
- key.map { |k| backend.translate(locale, k, options) }
- else
- backend.translate(locale, key, options)
- end
- end
- result.is_a?(MissingTranslation) ? handle_exception(handling, result, locale, key, options) : result
- end
- alias :t :translate
- end
-end
-
View
75 src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/sass_compiler.rb
@@ -1,75 +0,0 @@
-require 'sass'
-require 'iron_sharepoint/mixins/logging'
-
-module IronSharePoint
- module SassCompiler
- class << self
- include Mixins::Logging
- attr_accessor :runtime
-
- def runtime
- @runtime || $RUNTIME
- end
-
- def watch
- unless watching?
- @handler = Proc.new do |sender, args|
- if (args.event == "ItemUpdated" || args.event == "ItemAdded")
- props = args.event_properties
- extension = parse_extension props.after_url
- if ([:scss, :sass].include? extension)
- compile_files
- end
- end
- end
- hive.events.add @handler
- logger.info "SassCompiler is watching sass files."
- end
- end
-
- def compile_file url
- extension = parse_extension url
- css_url = url.gsub(/\.(sass|scss)/, ".css")
- content = hive.load_text url
- begin
- engine = Sass::Engine.new content, :syntax => extension, :load_paths => [".", "app/assets/stylesheets"], :cache => false
- hive.add css_url, engine.render
- logger.info "Compiled file #{url}"
- rescue Exception => ex
- logger.error "Couldn't compile file #{url}"
- logger.error ex
- end
- end
-
- def compile_files
- sass_files = hive.files.select do |x|
- x[/^app\/assets\/stylesheets\/\w+\.(scss|sass)/]
- end
- sass_files.each {|file| compile_file file}
- end
-
- def parse_extension url
- extension = url[/\.\w+$/]
- unless extension.nil?
- extension = extension[1..-1].to_sym
- end
- end
-
- def stop_watching
- if watching?
- hive.events.remove @handler
- @handler = nil
- logger.info "SassCompiler stopped watching sass files."
- end
- end
-
- def watching?
- !@handler.nil?
- end
-
- def hive
- runtime.iron_hive
- end
- end
- end
-end
View
2  src/IronSharePoint/TEMPLATE/Features/IronSP_Root/iron_sharepoint/version.rb
@@ -1,3 +1,3 @@
module IronSharePoint
- VERSION = "1.0.5"
+ VERSION = "2.0.0"
end

No commit comments for this range

Something went wrong with that request. Please try again.