チェンジセット 1685 (default)

日時:

2024/09/03 22:50:27 (5週前)

更新者:

hizuya@…

ログメッセージ:

• JQueryImageHyperLink を追加。

場所:

framework/trunk

ファイル:

• WebApplication/UI/WebControls/JQueryImageHyperLinkPage.aspx (追加)
• WebApplication/UI/WebControls/JQueryImageHyperLinkPage.aspx.cs (追加)
• WebApplication/UI/WebControls/JQueryImageHyperLinkPage.aspx.designer.cs (追加)
• WebApplication/WebApplication.csproj (更新) (2個の差分)
• WebLibrary/Sources/UI/WebControls/JQueryImage.cs (更新) (2個の差分)
• WebLibrary/Sources/UI/WebControls/JQueryImageHyperLink.cs (追加)
• WebLibrary/Sources/Utility.cs (更新) (1個の差分)
• WebLibrary/WebLibrary.csproj (更新) (1個の差分)

framework/trunk/WebApplication/WebApplication.csproj

@@ -80 +80 @@
     <Content Include="UI\WebControls\FormViewPage.aspx" />
     <Content Include="UI\WebControls\FormViewWithControlsPage.aspx" />
+    <Content Include="UI\WebControls\JQueryImageHyperLinkPage.aspx" />
     <Content Include="UI\WebControls\ObjectDataSourceFormViewPage.aspx" />
     <Content Include="UI\WebControls\RadioButtonFieldPage.aspx" />
@@ -408 +409 @@
     <Compile Include="UI\Parameter\ParameterMemberPage.aspx.designer.cs">
       <DependentUpon>ParameterMemberPage.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="UI\WebControls\JQueryImageHyperLinkPage.aspx.cs">
+      <DependentUpon>JQueryImageHyperLinkPage.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="UI\WebControls\JQueryImageHyperLinkPage.aspx.designer.cs">
+      <DependentUpon>JQueryImageHyperLinkPage.aspx</DependentUpon>
     </Compile>
     <Compile Include="UI\WebControls\ObjectDataSourceFormViewPage.aspx.cs">

framework/trunk/WebLibrary/Sources/UI/WebControls/JQueryImage.cs

@@ -65 +65 @@
         /// </summary>
         public JQueryImage()
-            : base(HtmlTextWriterTag.Div)
+            : this(HtmlTextWriterTag.Div)
+        {
+            // AVOID
+        }
+
+        /// <summary>
+        /// インスタンスを作成します。
+        /// </summary>
+        /// <param name="tag"><see cref="HtmlTextWriterTag"/>。</param>
+        protected JQueryImage(HtmlTextWriterTag tag)
+            : base(tag)
         {
             ControlInitializer.ApplyProperties(this);
@@ -237 +247 @@
             writer.AddAttribute(HtmlTextWriterAttribute.Class, "ui-icon  ui-icon-" + iconName.ToLowerInvariant());
 
-            string alternateText = AlternateText;
-            if (alternateText.Length > 0 || GenerateEmptyAlternateText)
-            {
-                writer.AddAttribute(HtmlTextWriterAttribute.Title, alternateText); 
+            string toolTip = ToolTip;
+            if (!string.IsNullOrEmpty(toolTip))
+            {
+                string alternateText = AlternateText;
+                if (alternateText.Length > 0 || GenerateEmptyAlternateText)
+                {
+                    writer.AddAttribute(HtmlTextWriterAttribute.Title, alternateText);
+                }
             }
 

framework/trunk/WebLibrary/Sources/Utility.cs

@@ -54 +54 @@
 
         /// <summary>
+        /// .NET Framework の 4.0 を表すバージョンです。
+        /// </summary>
+        internal static readonly Version Framework40 = new Version(4, 0);
+
+        /// <summary>
         /// カルチャの自動選択を表す文字列。
         /// </summary>

framework/trunk/WebLibrary/WebLibrary.csproj

@@ -165 +165 @@
     </Compile>
     <Compile Include="Sources\UI\WebControls\JQueryImageDialogOpenButton.cs" />
+    <Compile Include="Sources\UI\WebControls\JQueryImageHyperLink.cs" />
     <Compile Include="Sources\UI\WebControls\NumericBox.cs" />
     <Compile Include="Sources\UI\WebControls\ObjectDataSource.cs" />