Sync 2017-01-17

.idea/workspace.xml

@@ -21,79 +21,44 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="RptHome.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/RptHome.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="8.142858">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="WijmoDemo.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-55.42857">
-              <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="BillsDemo.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/BillsDemo.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-3.392857">
-              <caret line="5" column="57" selection-start-line="5" selection-start-column="57" selection-end-line="5" selection-end-column="57" />
+            <state vertical-scroll-proportion="-13.357142">
+              <caret line="62" column="37" selection-start-line="62" selection-start-column="37" selection-end-line="62" selection-end-column="37" />
               <folding>
                 <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="smartcostdb.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/protect/models/smartcostdb.js">
+      <file leaf-file-name="WijmoDemo.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="5" selection-end-column="22" />
+            <state vertical-scroll-proportion="-14.714286">
+              <caret line="68" column="30" selection-start-line="68" selection-start-column="30" selection-end-line="68" selection-end-column="30" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bills.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/protect/models/bills.js">
+      <file leaf-file-name="standalone.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/standalone.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.19256757">
-              <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
-              <folding>
-                <element signature="e#0#40#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/server.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="28" column="18" selection-start-line="28" selection-start-column="10" selection-end-line="28" selection-end-column="18" />
+            <state vertical-scroll-proportion="-15.392858">
+              <caret line="77" column="0" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="billController.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/protect/controllers/billController.js">
+      <file leaf-file-name="bills.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/protect/models/bills.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
+              <caret line="39" column="8" selection-start-line="39" selection-start-column="8" selection-end-line="39" selection-end-column="8" />
               <folding>
                 <element signature="e#0#40#0" expanded="false" />
               </folding>
@@ -101,21 +66,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="reportController.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/protect/controllers/reportController.js">
+      <file leaf-file-name="rpt_font.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/protect/models/rpt_font.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="42" column="61" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="61" />
+            <state vertical-scroll-proportion="0.36121672">
+              <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="cacheController.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/protect/controllers/cacheController.js">
+      <file leaf-file-name="server.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/server.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="3" column="8" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
+            <state vertical-scroll-proportion="-10.76">
+              <caret line="33" column="24" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="24" />
               <folding />
             </state>
           </provider>
@@ -137,13 +102,20 @@
         <option value="$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js" />
         <option value="$PROJECT_DIR$/src/SmartCostHome.html" />
         <option value="$PROJECT_DIR$/src/tpl/WijmoDemo.html" />
-        <option value="$PROJECT_DIR$/src/WijmoDemo.html" />
         <option value="$PROJECT_DIR$/src/RptHome.html" />
-        <option value="$PROJECT_DIR$/protect/db/demodb.js" />
-        <option value="$PROJECT_DIR$/protect/models/bills.js" />
         <option value="$PROJECT_DIR$/protect/controllers/billController.js" />
-        <option value="$PROJECT_DIR$/src/BillsDemo.html" />
+        <option value="$PROJECT_DIR$/protect/models/smartcostdb.js" />
+        <option value="$PROJECT_DIR$/protect/models/rpt_template.js" />
+        <option value="$PROJECT_DIR$/protect/models/rpt_temp_data.js" />
+        <option value="$PROJECT_DIR$/protect/models/rpt_style.js" />
+        <option value="$PROJECT_DIR$/protect/models/rpt_font.js" />
+        <option value="$PROJECT_DIR$/protect/models/rpt_control.js" />
+        <option value="$PROJECT_DIR$/protect/db/demodb.js" />
         <option value="$PROJECT_DIR$/server.js" />
+        <option value="$PROJECT_DIR$/src/WijmoDemo.html" />
+        <option value="$PROJECT_DIR$/src/standalone.html" />
+        <option value="$PROJECT_DIR$/src/BillsDemo.html" />
+        <option value="$PROJECT_DIR$/protect/models/bills.js" />
       </list>
     </option>
   </component>
@@ -183,7 +155,7 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -226,104 +198,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="wijmo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="wijmo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="styles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="bootstrap" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="smartconstruct" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="protect" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -381,10 +255,14 @@
               <option name="myItemId" value="protect" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cache" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -466,21 +344,30 @@
     </task>
     <servers />
   </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+  </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17386723" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <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" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="TypeScript Compiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22054054" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <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" />
       <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" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32864866" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864866" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <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" />
-      <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" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <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" />
-      <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" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <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" />
       <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" />
       <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" />
@@ -502,84 +389,80 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="13" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/SmartCostHome.html">
+    <entry file="file://$PROJECT_DIR$/server.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="7" column="44" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="44" />
+          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
+    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/server.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="24" column="19" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="19" />
+          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
+    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/SmartCostHome.html">
+    <entry file="file://$PROJECT_DIR$/server.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="7" column="44" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="44" />
+          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
+    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="24" column="19" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="19" />
+          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/server.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -587,153 +470,158 @@
     <entry file="file://$PROJECT_DIR$/src/RptHome.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/SmartCostHome.html">
+    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="7" column="44" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="44" />
+          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.chart.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="24" column="19" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="19" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.grid.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/vendor/wijmo.grid.sheet.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/SmartCostHome.html">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.42745537">
+          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/src/css/main.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
-          <folding />
+        <state vertical-scroll-proportion="-1.6368244">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/src/css/bootstrap/bootstrap.min.css">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-4.75">
+          <caret line="7" column="9" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_style.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.10836502">
+          <caret line="3" column="35" selection-start-line="3" selection-start-column="35" selection-end-line="3" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_temp_data.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+          <caret line="3" column="35" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
+    <entry file="file://$PROJECT_DIR$/protect/cache/rpt_cache.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.36121672">
+          <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/protect/controllers/cacheController.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
-          <folding />
+          <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_control.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.3581081">
+          <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
+    <entry file="file://$PROJECT_DIR$/protect/db/demodb.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.12837838">
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#40#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/smartcostdb.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.19256757">
+          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.min.js">
+    <entry file="file://$PROJECT_DIR$/protect/controllers/billController.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.4543919">
+          <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#40#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.grid.sheet.min.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="3.8">
+          <caret line="12" column="3751" selection-start-line="12" selection-start-column="3742" selection-end-line="12" selection-end-column="3751" />
           <folding>
             <element signature="n#!!doc" expanded="false" />
           </folding>
@@ -744,10 +632,11 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.chart.min.js">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/wijmo.min.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -757,33 +646,31 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.chart.d.ts">
+    <entry file="file://$PROJECT_DIR$/src/SmartCostHome.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2583238">
-          <caret line="484" column="19" selection-start-line="484" selection-start-column="8" selection-end-line="484" selection-end-column="19" />
+        <state vertical-scroll-proportion="0.2358156">
+          <caret line="7" column="44" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="44" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.grid.min.js">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/wijmo.grid.sheet/FlexSheet.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-          </folding>
+          <caret line="299" column="43" selection-start-line="299" selection-start-column="16" selection-end-line="299" selection-end-column="43" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/vendor/wijmo.grid.sheet.min.js">
+    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.39361703">
+          <caret line="61" column="55" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.grid.sheet.min.js">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/wijmo.grid.sheet/ScrollBar.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -791,58 +678,65 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/src/wijmo/styles/app.css">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/SmartCostHome.html">
+    <entry file="file://$PROJECT_DIR$/src/scripts/wijmo/wijmo.min.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2003012">
-          <caret line="7" column="44" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="44" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="n#!!doc" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/wijmo/controls/wijmo.grid.d.ts">
+    <entry file="file://$PROJECT_DIR$/src/resources/wijmo5.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/scripts/ExcelConverter/ExcelConverter.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="224" column="60" selection-start-line="224" selection-start-column="60" selection-end-line="224" selection-end-column="60" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/protect/db/demodb.js">
+    <entry file="file://$PROJECT_DIR$/src/styles/wijmo.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.042410713">
-          <caret line="4" column="37" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
-          <folding>
-            <element signature="e#0#40#0" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/protect/models/rpt_temp_data.js">
+    <entry file="file://$PROJECT_DIR$/src/styles/app.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.63616073">
-          <caret line="30" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/jpc_report/rpt_component/Jpc_Output.js">
+    <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42745537">
-          <caret line="176" column="54" selection-start-line="176" selection-start-column="54" selection-end-line="176" selection-end-column="54" />
+        <state vertical-scroll-proportion="-14.714286">
+          <caret line="68" column="30" selection-start-line="68" selection-start-column="30" selection-end-line="68" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/protect/controllers/cacheController.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_template.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="3" column="8" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.839527">
+          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
           <folding />
         </state>
       </provider>
@@ -850,92 +744,71 @@
     <entry file="file://$PROJECT_DIR$/protect/controllers/reportController.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="42" column="61" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="61" />
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/protect/controllers/billController.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_component/Jpc_CrossTab.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#40#0" expanded="false" />
-          </folding>
+          <caret line="113" column="35" selection-start-line="113" selection-start-column="35" selection-end-line="113" selection-end-column="35" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/server.js">
+    <entry file="file://$PROJECT_DIR$/src/standalone.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="28" column="18" selection-start-line="28" selection-start-column="10" selection-end-line="28" selection-end-column="18" />
+        <state vertical-scroll-proportion="-15.392858">
+          <caret line="77" column="0" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/RptHome.html">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_component/helper/Jpc_Helper_CrossTab.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="8.142858">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.44676808">
+          <caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="38" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/BillsDemo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.392857">
-          <caret line="5" column="57" selection-start-line="5" selection-start-column="57" selection-end-line="5" selection-end-column="57" />
+        <state vertical-scroll-proportion="-13.357142">
+          <caret line="62" column="37" selection-start-line="62" selection-start-column="37" selection-end-line="62" selection-end-column="37" />
           <folding>
             <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/css/main.css">
+    <entry file="file://$PROJECT_DIR$/server.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.6368244">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-10.76">
+          <caret line="33" column="24" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/css/bootstrap/bootstrap.min.css">
+    <entry file="file://$PROJECT_DIR$/protect/models/bills.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/WijmoDemo.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-55.42857">
-          <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+          <caret line="39" column="8" selection-start-line="39" selection-start-column="8" selection-end-line="39" selection-end-column="8" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="e#0#40#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/protect/models/smartcostdb.js">
+    <entry file="file://$PROJECT_DIR$/protect/models/rpt_font.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="5" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.36121672">
+          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/protect/models/bills.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19256757">
-          <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#40#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>

protect/db/demodb.js

@@ -2,5 +2,6 @@
  * Created by Tony on 2017/1/13.
  */
 var mg = require('mongoose');
-mg.createConnection('localhost','Demo');
-exports.mongoose = mg;
+var db = mg.createConnection('localhost','Demo');
+//mg.connect('mongodb://localhost/Demo');
+exports.mongoose = db;

protect/models/bills.js

@@ -1,14 +1,16 @@
 /**
  * Created by Tony on 2017/1/12.
  */
+var mongoose = require('mongoose');
 var demodb = require('../db/demodb');
-var Schema = demodb.mongoose.Schema;
+//var Schema = demodb.mongoose.Schema;
+var Schema = mongoose.Schema;
 var BillsSchema = new Schema({
-    "SerialNo": String,
-    "ChapterID": String,
-    "ID": String,
-    "ParentID": String,
-    "NextSiblingID": String,
+    "SerialNo": Number,
+    "ChapterID": Number,
+    "ID": Number,
+    "ParentID": Number,
+    "NextSiblingID": Number,
     "Code": String,
     "FullCode": String,
     "Name": String,
@@ -17,18 +19,29 @@ var BillsSchema = new Schema({
     "Memostr": String
 });
 
-var TemplateData = demodb.mongoose.model("TestBills", BillsSchema);
+var BillsData = demodb.mongoose.model("bills", BillsSchema);
+//var TemplateData = demodb.model("TestBills", BillsSchema);
 
 var BillDataDAO = function(){};
 
-//根据id获取临时数据
+BillDataDAO.prototype.get = function(id, callback){
+    Control.find({ID: id}, function(err, templates){
+        if(templates.length){
+            callback(false, templates[0]);
+        }
+        else{
+            callback('No result found!');
+        }
+    })
+}
+
 BillDataDAO.prototype.getAll = function(userid, callback){
-    TemplateData.find({}, function(err, templates){
+    BillsData.find({}, function(err, templates){
         if(templates.length){
             callback(false, templates);
         }
         else{
-            callback('查找不到模板临时数据！');
+            callback('No result found!');
         }
     })
 }

protect/models/rpt_control.js

@@ -1,8 +1,10 @@
 /**
  * Created by Tony on 2016/12/23.
  */
+var mongoose = require('mongoose');
 var smartcostdb = require('./smartcostdb');
-var Schema = smartcostdb.mongoose.Schema;
+//var Schema = smartcostdb.mongoose.Schema;
+var Schema = mongoose.Schema;
 var CtrlSchema = new Schema({
     "ID" : String,
     "Shrink" : String,
@@ -13,6 +15,7 @@ var CtrlSchema = new Schema({
 });
 
 var Control = smartcostdb.mongoose.model("com_ctrls", CtrlSchema);
+//var Control = smartcostdb.model("com_ctrls", CtrlSchema);
 
 var CtrlDAO = function(){};
 

protect/models/rpt_font.js

@@ -1,8 +1,10 @@
 /**
  * Created by Tony on 2016/12/23.
  */
+var mongoose = require('mongoose');
 var smartcostdb = require('./smartcostdb');
-var Schema = smartcostdb.mongoose.Schema;
+//var Schema = smartcostdb.mongoose.Schema;
+var Schema = mongoose.Schema;
 var FontSchema = new Schema({
     "ID" : String,
     "Name" : String,
@@ -16,6 +18,7 @@ var FontSchema = new Schema({
 });
 
 var Font = smartcostdb.mongoose.model("com_fonts", FontSchema);
+//var Font = smartcostdb.model("com_fonts", FontSchema);
 
 var FontDAO = function(){};
 

protect/models/rpt_style.js

@@ -1,14 +1,17 @@
 /**
  * Created by Tony on 2016/12/23.
  */
+var mongoose = require('mongoose');
 var smartcostdb = require('./smartcostdb');
-var Schema = smartcostdb.mongoose.Schema;
+//var Schema = smartcostdb.mongoose.Schema;
+var Schema = mongoose.Schema;
 var StyleSchema = new Schema({
     "ID" : String,
     "border_style" : Array
 });
 
 var Style = smartcostdb.mongoose.model("com_styles", StyleSchema);
+//var Style = smartcostdb.model("com_styles", StyleSchema);
 
 var StyleDAO = function(){};
 

protect/models/rpt_temp_data.js

@@ -1,8 +1,10 @@
 /**
  * Created by Tony on 2016/12/28.
  */
+var mongoose = require('mongoose');
 var smartcostdb = require('./smartcostdb');
-var Schema = smartcostdb.mongoose.Schema;
+//var Schema = smartcostdb.mongoose.Schema;
+var Schema = mongoose.Schema;
 var RptTemplateDataSchema = new Schema({
     "Data_Key": String,
     "discrete_data": Array,
@@ -11,6 +13,7 @@ var RptTemplateDataSchema = new Schema({
 });
 
 var TemplateData = smartcostdb.mongoose.model("temp_tpl_datas", RptTemplateDataSchema);
+//var TemplateData = smartcostdb.model("temp_tpl_datas", RptTemplateDataSchema);
 
 var RplTplDataDAO = function(){};
 

protect/models/rpt_template.js

@@ -1,8 +1,10 @@
 /**
  * Created by Tony on 2016/12/23.
  */
+var mongoose = require('mongoose');
 var smartcostdb = require('./smartcostdb');
-var Schema = smartcostdb.mongoose.Schema;
+//var Schema = smartcostdb.mongoose.Schema;
+var Schema = mongoose.Schema;
 var RptTemplateSchema = new Schema({
     "GROUP_KEY": String,
     "ID_KEY": String,
@@ -17,6 +19,7 @@ var RptTemplateSchema = new Schema({
 });
 
 var Template = smartcostdb.mongoose.model("rpt_templates", RptTemplateSchema);
+//var Template = smartcostdb.model("rpt_templates", RptTemplateSchema);
 
 var RplTplDAO = function(){};
 

protect/models/smartcostdb.js

@@ -2,5 +2,6 @@
  * Created by Tony on 2016/12/23.
  */
 var mg = require('mongoose');
-mg.connect('mongodb://localhost/Reports');
-exports.mongoose = mg;
+var db = mg.createConnection('localhost','Reports');
+//mg.connect('mongodb://localhost/Reports');
+exports.mongoose = db;

server.js

@@ -12,6 +12,7 @@ app.use(bodyParser.json());
 
 var reportController = require(protectDir + 'controllers/reportController');
 var cacheController = require(protectDir + 'controllers/cacheController');
+var billController = require(protectDir + 'controllers/billController');
 
 //注册路由
 app.get('/', function(req, res){
@@ -30,6 +31,10 @@ app.get('/billdemo', function(req, res){
 	res.sendFile(_rootDir+'/src/BillsDemo.html');
 });
 
+app.get('/standalonedemo', function(req, res){
+	res.sendFile(_rootDir+'/src/standalone.html');
+});
+
 app.post('/report/', function(req, res, next){
 	console.log(req.body['tpl_id']);
 	res.setHeader("Access-Control-Allow-Origin", "*");
@@ -40,7 +45,7 @@ var apiRouter = express.Router();
 
 apiRouter.post('/getReport', reportController.getReportAllPages);
 apiRouter.post('/setDftCache', cacheController.setReportDefaultCache);
-apiRouter.post('/getBills', cacheController.setReportDefaultCache);
+apiRouter.post('/getBills', billController.getAllBills);
 
 app.use('/api', apiRouter);
 

src/BillsDemo.html

@@ -1,18 +1,28 @@
 <!DOCTYPE html>
 <html>
 <head lang="en">
-    <meta charset="UTF-8">
+    <meta charset="utf-8">
     <title></title>
     <link rel="stylesheet" href="src/css/bootstrap/bootstrap.min.css" >
-    <link rel="stylesheet" href="src/css/bootstrap/themes.css">
     <link rel="stylesheet" href="src/css/main.css">
     <link rel="stylesheet" href="src/css/font-awesome/font-awesome.min.css">
+    <!--
+    <link rel="stylesheet" href="src/css/bootstrap/themes.css">
+    -->
+
+    <!-- app scripts and styles -->
 </head>
+<script src="/src/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="/src/wijmo/controls/wijmo.min.js"></script>
+<script type="text/javascript" src="/src/wijmo/controls/wijmo.grid.sheet.min.js"></script>
+<link href="/src/wijmo/styles/wijmo.min.css" rel="stylesheet"/>
+<!-- Wijmo controls (optional, include the controls you need) -->
+<script src="/src/wijmo/controls/wijmo.grid.min.js"></script>
 <body>
     <nav class="navbar navbar-light bg-faded p-0 ">
-            <span class="header-logo px-1" >
-              Smartcost
-            </span>
+                <span class="header-logo px-1" >
+                  Smartcost
+                </span>
         <div class="float-lg-right navbar-text pb-0">
             <div class="dropdown d-inline-block">
                 <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">康彤</button>
@@ -22,9 +32,9 @@
                     <a class="dropdown-item" href="user-set.html">设置</a>
                 </div>
             </div>
-            <span class="btn btn-link btn-sm new-msg"  >
-              <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;6
-            </span>
+                <span class="btn btn-link btn-sm new-msg"  >
+                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;6
+                </span>
             <button class="btn btn-link btn-sm">
                 注销
             </button>
@@ -33,6 +43,11 @@
 
     <p>测试 FlexGrid 控件：</p>
     <div id="theGrid" style="width:100%;height:auto;"></div>
+    <p>测试 FlexSheet 控件：</p>
+    <div id="flexsheet" style="width:100%;height:auto;"></div>
+    <!--
+
+    -->
 </body>
 <script id="scriptInit" type="text/javascript">
     $(document).ready(function () {
@@ -40,29 +55,31 @@
             type:"POST",
             url: 'http://localhost:3010/api/getBills',
             dataType: 'json',
+            data: {"user_id": ""},
             cache: false,
             timeout: 10000,
             success: function(result){
-                // 生成一些随机数据
-                var countries = 'US,Germany,UK,Japan,Italy,Greece'.split(','),
-                        data = [];
-                for (var i = 0; i < countries.length; i++) {
-                    data.push({
-                        country: countries[i],
-                        downloads: Math.round(Math.random() * 20000),
-                        sales: Math.random() * 10000,
-                        expenses: Math.random() * 5000
-                    });
-                }
-
-                var grid = new wijmo.grid.FlexGrid('#theGrid');
-                grid.itemsSource = data;
+                //var data = result.data;
+                var data = result.data.slice(0);
+                buildGrid(data);
+                //buildSheet(data);
             },
             error: function(jqXHR, textStatus, errorThrown){
-                //alert('error ' + textStatus + " " + errorThrown);
+                alert('没有清单！');
                 //or create local default cache...
             }
         });
     });
+
+    function buildGrid(data) {
+        var grid = new wijmo.grid.FlexGrid('#theGrid');
+        grid.itemsSource = data;
+    }
+
+    function buildSheet(sheetData) {
+        var flex = new wijmo.grid.sheet.FlexSheet('#flexsheet');
+        flex.addUnboundSheet('Empty Sheet');
+        flex.selectedSheetIndex = 0;
+    }
 </script>
 </html>

src/wijmo/controls/cultures/wijmo.culture.de.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.de.js

@@ -1,22 +1,24 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: de (German)
-*/
+ * Wijmo culture file: de (German)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'de',
+            displayName: 'German',
             numberFormat: {
                 '.': ',',
                 ',': '.',
@@ -42,50 +44,236 @@ var wijmo;
                     y: 'MMMM yyyy', Y: 'MMMM yyyy',
                     g: 'dd.MM.yyyy HH:mm', G: 'dd.MM.yyyy HH:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} Artikel ausgewählt'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} Titel)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} Elemente)'
         },
         FlexGridFilter: {
-            header: 'Zeige Artikel mit Wert',
-            and: 'Und',
-            or: 'Oder',
+            // filter
+            ascending: '\u2191 Aufsteigend',
+            descending: '\u2193 Absteigend',
             apply: 'Anwenden',
             clear: 'Löschen',
+            conditions: 'Nach Zustand filtern',
+            values: 'Nach Wert filtern',
+            // value filter
+            search: 'Suche',
+            selectAll: 'Alles auswählen',
+            null: '(nichts)',
+            // condition filter
+            header: 'Zeige Elemente mit dem Wert',
+            and: 'Und',
+            or: 'Oder',
             stringOperators: [
-                { name: '(Nicht festgelegt)', op: null },
-                { name: 'Gleich', op: 0 },
-                { name: 'Ist Nicht gleich', op: 1 },
-                { name: 'Beginnt mit', op: 6 },
+                { name: '(nicht eingestellt)', op: null },
+                { name: 'Ist gleich', op: 0 },
+                { name: 'Ist nicht gleich', op: 1 },
+                { name: 'Fängt an mit', op: 6 },
                 { name: 'Endet mit', op: 7 },
                 { name: 'Enthält', op: 8 },
                 { name: 'Enthält nicht', op: 9 }
             ],
             numberOperators: [
-                { name: '(Nicht festgelegt)', op: null },
-                { name: 'Gleich', op: 0 },
-                { name: 'Ist Nicht gleich', op: 1 },
-                { name: 'Größer als', op: 2 },
-                { name: 'Größer oder gleich', op: 3 },
-                { name: 'Kleiner als', op: 4 },
+                { name: '(nicht eingestellt)', op: null },
+                { name: 'Ist gleich', op: 0 },
+                { name: 'Ist nicht gleich', op: 1 },
+                { name: 'Ist größer als', op: 2 },
+                { name: 'Ist größer als oder gleich', op: 3 },
+                { name: 'Weniger als', op: 4 },
                 { name: 'Kleiner oder gleich', op: 5 }
             ],
             dateOperators: [
-                { name: '(Nicht festgelegt)', op: null },
-                { name: 'Gleich', op: 0 },
-                { name: 'Vor', op: 4 },
-                { name: 'Nach', op: 3 }
+                { name: '(nicht eingestellt)', op: null },
+                { name: 'Ist gleich', op: 0 },
+                { name: 'Ist vor', op: 4 },
+                { name: 'ist nach', op: 3 }
             ],
             booleanOperators: [
-                { name: '(Nicht festgelegt)', op: null },
-                { name: 'Gleich', op: 0 },
-                { name: 'Ist Nicht gleich', op: 1 }
+                { name: '(nicht eingestellt)', op: null },
+                { name: 'Ist gleich', op: 0 },
+                { name: 'Ist nicht gleich', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Feldeinstellungen:',
+                header: 'Header:',
+                summary: 'Zusammenfassung:',
+                showAs: 'Zeigen Sie als an:',
+                weighBy: 'Wiegen von:',
+                sort: 'Sortieren:',
+                filter: 'Filter:',
+                format: 'Formatierung:',
+                sample: 'Sampling:',
+                edit: 'Bearbeiten…',
+                clear: 'Löschen',
+                ok: 'OK',
+                cancel: 'Abbrechen',
+                none: '(kein)',
+                sorts: {
+                    asc: 'Aufsteigend',
+                    desc: 'Absteigend'
+                },
+                aggs: {
+                    sum: 'Summe',
+                    cnt: 'Anzahl',
+                    avg: 'Mittelwert',
+                    max: 'Max',
+                    min: 'Min.',
+                    rng: 'Bereich',
+                    std: 'Standardabweichung (Stichprobe)',
+                    var: 'Varianz',
+                    stdp: 'StdDevPop',
+                    varp: 'VarPop'
+                },
+                calcs: {
+                    noCalc: 'Keine Berechnung',
+                    dRow: 'Unterschied zu vorherigen Zeile',
+                    dRowPct: '% Unterschied zu vorherigen Zeile',
+                    dCol: 'Unterschied zu vorherigen Spalte',
+                    dColPct: '% Unterschied zu vorherigen Spalte',
+                    dPctGrand: '% der Gesamtsumme',
+                    dPctRow: '% der gesamten Zeile',
+                    dPctCol: '% der Spalte Gesamt',
+                    dRunTot: 'Laufende Summe',
+                    dRunTotPct: 'laufende Summe %'
+                },
+                formats: {
+                    n0: 'Ganzzahl (n0)',
+                    n2: 'Schwimmer (n2)',
+                    c: 'Währung (c)',
+                    p0: 'Prozentsatz (p0)',
+                    p2: 'Prozentsatz (p2)',
+                    n2c: 'Tausende (n2)',
+                    n2cc: 'Millionen (n2),,',
+                    n2ccc: 'Milliarden (n2,,,)',
+                    d: 'Datum (d)',
+                    MMMMddyyyy: 'Monat Tag Jahr (MMMM Dd, Yyyy)',
+                    dMyy: 'Tag Monat Jahr (d/M/Yy)',
+                    ddMyy: 'Tag Monat Jahr (Dd/M/Yy)',
+                    dMyyyy: 'Tag Monat Jahr (M/TT/JJJJ)',
+                    MMMyyyy: 'Monat Jahr (MMM Yyyy)',
+                    MMMMyyyy: 'Monat Jahr (MMMM Yyyy)',
+                    yyyyQq: 'Quartal des Jahres (Yyyy "Q" Q)',
+                    FYEEEEQU: 'Geschäftsjahr-Viertel ("FY" EEEE "Q" U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Gesamtsumme',
+                subTotal: 'Teilergebnis'
+            },
+            PivotPanel: {
+                fields: 'Wählen Sie Felder zum Bericht hinzufügen:',
+                drag: 'Felder zwischen den Bereichen unten ziehen:',
+                filters: 'Filter',
+                cols: 'Spalten',
+                rows: 'Zeilen',
+                vals: 'Werte',
+                defer: 'Updates zu verschieben',
+                update: 'Aktualisieren'
+            },
+            _ListContextMenu: {
+                up: 'Nach oben',
+                down: 'Nach unten',
+                first: 'An den Anfang',
+                last: 'Zum Ende bewegen',
+                filter: 'Wechseln zu Berichtsfilter',
+                rows: 'Wechseln zu Zeilenbeschriftungen',
+                cols: 'Wechseln zu Spaltenbeschriftungen',
+                vals: 'Wechseln zu Werten',
+                remove: 'Feld entfernen',
+                edit: 'Feldeinstellungen…',
+                detail: 'Details anzeigen…'
+            },
+            PivotChart: {
+                by: 'von',
+                and: 'und'
+            },
+            DetailDialog: {
+                header: 'Detailansicht:',
+                ok: 'OK',
+                items: '{cnt:n0} Elemente',
+                item: '{cnt} Element',
+                row: 'ROW',
+                col: 'Spalte'
+            }
+        },
+        Viewer: {
+            cancel: 'Abbrechen',
+            ok: 'OK',
+            bottom: 'Unten:',
+            top: 'Oben:',
+            right: 'Rechts:',
+            left: 'Links:',
+            margins: 'Ränder (Zoll)',
+            orientation: 'Orientierung:',
+            paperKind: 'Papierart:',
+            pageSetup: 'Seiteneinrichtung',
+            landscape: 'Querformat',
+            portrait: 'Hochformat',
+            pageNumber: 'Seitenzahl',
+            zoomFactor: 'Zoom-Faktor',
+            paginated: 'Drucklayout',
+            print: 'Drucken',
+            search: 'Suche',
+            matchCase: 'Groß-/Kleinschreibung beachten',
+            wholeWord: 'Nur ganzes Wort suchen',
+            searchResults: 'Suchergebnisse',
+            previousPage: 'Vorherige Seite',
+            nextPage: 'Nächste Seite',
+            firstPage: 'Erste Seite',
+            lastPage: 'Letzte Seite',
+            backwardHistory: 'Rückwärts',
+            forwardHistory: 'Vorwärts',
+            pageCount: 'Seitenanzahl',
+            selectTool: 'Werkzeug auswählen',
+            moveTool: 'Verschieben-Werkzeug',
+            continuousMode: 'Kontinuierliche Seitenansicht',
+            singleMode: 'Seite Einzelansicht',
+            wholePage: 'Fit ganze Seite',
+            pageWidth: 'Seitenbreite passen',
+            zoomOut: 'Verkleinern Sie die Ansicht',
+            zoomIn: 'Zoom In',
+            exports: 'Exportieren',
+            fullScreen: 'Vollbild',
+            exitFullScreen: 'Vollbildmodus beenden',
+            thumbnails: 'Seitenminiaturen',
+            outlines: 'Dokumentstruktur',
+            loading: 'Werden geladen…',
+            pdfExportName: 'Adobe-PDF',
+            docxExportName: 'Open XML-Wort',
+            xlsxExportName: 'Open XML-Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Webarchiv (MHTML)',
+            htmlExportName: 'HTML-Dokument',
+            rtfExportName: 'RTF-Dokument',
+            metafileExportName: 'Komprimierte Metadateien',
+            csvExportName: 'CSV',
+            tiffExportName: 'TIFF-Bilder',
+            bmpExportName: 'BMP-Bilder',
+            emfExportName: 'Erweiterte Metadatei',
+            gifExportName: 'GIF-Bilder',
+            jpgExportName: 'JPEG-Bilder',
+            jpegExportName: 'JPEG-Bilder',
+            pngExportName: 'PNG-Bilder',
+            parameters: 'Parameter',
+            requiringParameters: 'Bitte geben Sie Parameter.',
+            nullParameterError: 'Der Wert darf nicht NULL sein.',
+            invalidParameterError: 'Ungültige Eingabe.',
+            parameterNoneItemsSelected: '(kein)',
+            parameterAllItemsSelected: '(alle)',
+            parameterSelectAllItemText: '(Alle auswählen)',
+            selectParameterValue: '(Wählen Sie Wert)',
+            apply: 'Anwenden',
+            errorOccured: 'Es ist ein Fehler aufgetreten.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.de.js.map
-

src/wijmo/controls/cultures/wijmo.culture.en-GB.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.en-GB.js

@@ -1,26 +1,28 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: en-GB (English (United Kingdom))
-*/
+ * Wijmo culture file: en-GB (English (United Kingdom))
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'en-GB',
+            displayName: 'English (United Kingdom)',
             numberFormat: {
                 '.': '.',
                 ',': ',',
-                percent: { pattern: ['-n %', 'n %'] },
+                percent: { pattern: ['-n%', 'n%'] },
                 currency: { decimals: 2, symbol: '£', pattern: ['-$n', '$n'] }
             },
             calendar: {
@@ -38,22 +40,36 @@ var wijmo;
                     d: 'dd/MM/yyyy', D: 'dd MMMM yyyy',
                     f: 'dd MMMM yyyy HH:mm', F: 'dd MMMM yyyy HH:mm:ss',
                     t: 'HH:mm', T: 'HH:mm:ss',
-                    m: 'dd MMMM', M: 'dd MMMM',
+                    m: 'd MMMM', M: 'd MMMM',
                     y: 'MMMM yyyy', Y: 'MMMM yyyy',
                     g: 'dd/MM/yyyy HH:mm', G: 'dd/MM/yyyy HH:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
+                fiscalYearOffsets: [3, 3]
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} items selected'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count} items)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} items)'
         },
         FlexGridFilter: {
+            // filter
+            ascending: '\u2191 Ascending',
+            descending: '\u2193 Descending',
+            apply: 'Apply',
+            clear: 'Clear',
+            conditions: 'Filter by Condition',
+            values: 'Filter by Value',
+            // value filter
+            search: 'Search',
+            selectAll: 'Select All',
+            null: '(nothing)',
+            // condition filter
             header: 'Show items where the value',
             and: 'And',
             or: 'Or',
-            apply: 'Apply',
-            clear: 'Clear',
             stringOperators: [
                 { name: '(not set)', op: null },
                 { name: 'Equals', op: 0 },
@@ -67,10 +83,10 @@ var wijmo;
                 { name: '(not set)', op: null },
                 { name: 'Equals', op: 0 },
                 { name: 'Does not equal', op: 1 },
-                { name: 'Is Greater than', op: 2 },
-                { name: 'Is Greater than or equal to', op: 3 },
-                { name: 'Is Less than', op: 4 },
-                { name: 'Is Less than or equal to', op: 5 }
+                { name: 'Is greater than', op: 2 },
+                { name: 'Is greater than or equal to', op: 3 },
+                { name: 'Is less than', op: 4 },
+                { name: 'Is less than or equal to', op: 5 }
             ],
             dateOperators: [
                 { name: '(not set)', op: null },
@@ -83,9 +99,182 @@ var wijmo;
                 { name: 'Equals', op: 0 },
                 { name: 'Does not equal', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Field settings:',
+                header: 'Header:',
+                summary: 'Summary:',
+                showAs: 'Show As:',
+                weighBy: 'Weigh by:',
+                sort: 'Sort:',
+                filter: 'Filter:',
+                format: 'Format:',
+                sample: 'Sample:',
+                edit: 'Edit…',
+                clear: 'Clear',
+                ok: 'OK',
+                cancel: 'Cancel',
+                none: '(none)',
+                sorts: {
+                    asc: 'Ascending',
+                    desc: 'Descending'
+                },
+                aggs: {
+                    sum: 'Sum',
+                    cnt: 'Count',
+                    avg: 'Average',
+                    max: 'Max',
+                    min: 'Min',
+                    rng: 'Range',
+                    std: 'StdDev',
+                    var: 'Var',
+                    stdp: 'StdDevPop',
+                    varp: 'VarPop'
+                },
+                calcs: {
+                    noCalc: 'No Calculation',
+                    dRow: 'Difference from previous row',
+                    dRowPct: '% Difference from previous row',
+                    dCol: 'Difference from previous column',
+                    dColPct: '% Difference from previous column',
+                    dPctGrand: '% of grand total',
+                    dPctRow: '% of row total',
+                    dPctCol: '% of column total',
+                    dRunTot: 'Running total',
+                    dRunTotPct: '% running total'
+                },
+                formats: {
+                    n0: 'Integer (n0)',
+                    n2: 'Float (n2)',
+                    c: 'Currency (c)',
+                    p0: 'Percentage (p0)',
+                    p2: 'Percentage (p2)',
+                    n2c: 'Thousands (n2,)',
+                    n2cc: 'Millions (n2,,)',
+                    n2ccc: 'Billions (n2,,,)',
+                    d: 'Date (d)',
+                    MMMMddyyyy: 'Month Day Year (MMMM dd, yyyy)',
+                    dMyy: 'Day Month Year (d/M/yy)',
+                    ddMyy: 'Day Month Year (dd/M/yy)',
+                    dMyyyy: 'Day Month Year (dd/M/yyyy)',
+                    MMMyyyy: 'Month Year (MMM yyyy)',
+                    MMMMyyyy: 'Month Year (MMMM yyyy)',
+                    yyyyQq: 'Year Quarter (yyyy "Q"q)',
+                    FYEEEEQU: 'Fiscal Year Quarter ("FY"EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Grand Total',
+                subTotal: 'Subtotal'
+            },
+            PivotPanel: {
+                fields: 'Choose fields to add to report:',
+                drag: 'Drag fields between areas below:',
+                filters: 'Filters',
+                cols: 'Columns',
+                rows: 'Rows',
+                vals: 'Values',
+                defer: 'Defer Updates',
+                update: 'Update'
+            },
+            _ListContextMenu: {
+                up: 'Move up',
+                down: 'Move down',
+                first: 'Move to Beginning',
+                last: 'Move to End',
+                filter: 'Move to Report Filter',
+                rows: 'Move to Row Labels',
+                cols: 'Move to Column Labels',
+                vals: 'Move to Values',
+                remove: 'Remove Field',
+                edit: 'Field Settings…',
+                detail: 'Show Detail…'
+            },
+            PivotChart: {
+                by: 'by',
+                and: 'and'
+            },
+            DetailDialog: {
+                header: 'Detail View:',
+                ok: 'OK',
+                items: '{cnt:n0} items',
+                item: '{cnt} item',
+                row: 'Row',
+                col: 'Column'
+            }
+        },
+        Viewer: {
+            cancel: 'Cancel',
+            ok: 'OK',
+            bottom: 'Bottom:',
+            top: 'Top:',
+            right: 'Right:',
+            left: 'Left:',
+            margins: 'Margins (inches)',
+            orientation: 'Orientation:',
+            paperKind: 'Paper Kind:',
+            pageSetup: 'Page Setup',
+            landscape: 'Landscape',
+            portrait: 'Portrait',
+            pageNumber: 'Page number',
+            zoomFactor: 'Zoom Factor',
+            paginated: 'Print Layout',
+            print: 'Print',
+            search: 'Search',
+            matchCase: 'Match case',
+            wholeWord: 'Match whole word only',
+            searchResults: 'Search Results',
+            previousPage: 'Previous page',
+            nextPage: 'Next page',
+            firstPage: 'First page',
+            lastPage: 'Last page',
+            backwardHistory: 'Backward',
+            forwardHistory: 'Forward',
+            pageCount: 'Page Count',
+            selectTool: 'Select Tool',
+            moveTool: 'Move Tool',
+            continuousMode: 'Continuous Page View',
+            singleMode: 'Single Page View',
+            wholePage: 'Fit Whole Page',
+            pageWidth: 'Fit Page Width',
+            zoomOut: 'Zoom out',
+            zoomIn: 'Zoom in',
+            exports: 'Export',
+            fullScreen: 'Full Screen',
+            exitFullScreen: 'Exit Full Screen',
+            thumbnails: 'Page Thumbnails',
+            outlines: 'Document Map',
+            loading: 'Loading…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Web archive (MHTML)',
+            htmlExportName: 'HTML document',
+            rtfExportName: 'RTF document',
+            metafileExportName: 'Compressed metafiles',
+            csvExportName: 'CSV',
+            tiffExportName: 'Tiff images',
+            bmpExportName: 'BMP images',
+            emfExportName: 'Enhanced metafile',
+            gifExportName: 'GIF images',
+            jpgExportName: 'JPEG images',
+            jpegExportName: 'JPEG images',
+            pngExportName: 'PNG images',
+            parameters: 'Parameters',
+            requiringParameters: 'Please input parameters.',
+            nullParameterError: 'Value cannot be null.',
+            invalidParameterError: 'Invalid input.',
+            parameterNoneItemsSelected: '(none)',
+            parameterAllItemsSelected: '(all)',
+            parameterSelectAllItemText: '(Select all)',
+            selectParameterValue: '(select value)',
+            apply: 'Apply',
+            errorOccured: 'An error has occured.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.en-GB.js.map
-

src/wijmo/controls/cultures/wijmo.culture.en.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.en.js

@@ -1,22 +1,24 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: en (English)
-*/
+ * Wijmo culture file: en (English)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'en',
+            displayName: 'English',
             numberFormat: {
                 '.': '.',
                 ',': ',',
@@ -42,18 +44,32 @@ var wijmo;
                     y: 'MMMM yyyy', Y: 'MMMM yyyy',
                     g: 'M/d/yyyy h:mm tt', G: 'M/d/yyyy h:mm:ss tt',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
+                fiscalYearOffsets: [-3, -3]
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} items selected'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} items)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} items)'
         },
         FlexGridFilter: {
+            // filter
+            ascending: '\u2191 Ascending',
+            descending: '\u2193 Descending',
+            apply: 'Apply',
+            clear: 'Clear',
+            conditions: 'Filter by Condition',
+            values: 'Filter by Value',
+            // value filter
+            search: 'Search',
+            selectAll: 'Select All',
+            null: '(nothing)',
+            // condition filter
             header: 'Show items where the value',
             and: 'And',
             or: 'Or',
-            apply: 'Apply',
-            clear: 'Clear',
             stringOperators: [
                 { name: '(not set)', op: null },
                 { name: 'Equals', op: 0 },
@@ -67,10 +83,10 @@ var wijmo;
                 { name: '(not set)', op: null },
                 { name: 'Equals', op: 0 },
                 { name: 'Does not equal', op: 1 },
-                { name: 'Is Greater than', op: 2 },
-                { name: 'Is Greater than or equal to', op: 3 },
-                { name: 'Is Less than', op: 4 },
-                { name: 'Is Less than or equal to', op: 5 }
+                { name: 'Is greater than', op: 2 },
+                { name: 'Is greater than or equal to', op: 3 },
+                { name: 'Is less than', op: 4 },
+                { name: 'Is less than or equal to', op: 5 }
             ],
             dateOperators: [
                 { name: '(not set)', op: null },
@@ -83,9 +99,182 @@ var wijmo;
                 { name: 'Equals', op: 0 },
                 { name: 'Does not equal', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Field settings:',
+                header: 'Header:',
+                summary: 'Summary:',
+                showAs: 'Show As:',
+                weighBy: 'Weigh by:',
+                sort: 'Sort:',
+                filter: 'Filter:',
+                format: 'Format:',
+                sample: 'Sample:',
+                edit: 'Edit…',
+                clear: 'Clear',
+                ok: 'OK',
+                cancel: 'Cancel',
+                none: '(none)',
+                sorts: {
+                    asc: 'Ascending',
+                    desc: 'Descending'
+                },
+                aggs: {
+                    sum: 'Sum',
+                    cnt: 'Count',
+                    avg: 'Average',
+                    max: 'Max',
+                    min: 'Min',
+                    rng: 'Range',
+                    std: 'StdDev',
+                    var: 'Var',
+                    stdp: 'StdDevPop',
+                    varp: 'VarPop'
+                },
+                calcs: {
+                    noCalc: 'No Calculation',
+                    dRow: 'Difference from previous row',
+                    dRowPct: '% Difference from previous row',
+                    dCol: 'Difference from previous column',
+                    dColPct: '% Difference from previous column',
+                    dPctGrand: '% of grand total',
+                    dPctRow: '% of row total',
+                    dPctCol: '% of column total',
+                    dRunTot: 'Running total',
+                    dRunTotPct: '% running total'
+                },
+                formats: {
+                    n0: 'Integer (n0)',
+                    n2: 'Float (n2)',
+                    c: 'Currency (c)',
+                    p0: 'Percentage (p0)',
+                    p2: 'Percentage (p2)',
+                    n2c: 'Thousands (n2,)',
+                    n2cc: 'Millions (n2,,)',
+                    n2ccc: 'Billions (n2,,,)',
+                    d: 'Date (d)',
+                    MMMMddyyyy: 'Month Day Year (MMMM dd, yyyy)',
+                    dMyy: 'Day Month Year (d/M/yy)',
+                    ddMyy: 'Day Month Year (dd/M/yy)',
+                    dMyyyy: 'Day Month Year (dd/M/yyyy)',
+                    MMMyyyy: 'Month Year (MMM yyyy)',
+                    MMMMyyyy: 'Month Year (MMMM yyyy)',
+                    yyyyQq: 'Year Quarter (yyyy "Q"q)',
+                    FYEEEEQU: 'Fiscal Year Quarter ("FY"EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Grand Total',
+                subTotal: 'Subtotal'
+            },
+            PivotPanel: {
+                fields: 'Choose fields to add to report:',
+                drag: 'Drag fields between areas below:',
+                filters: 'Filters',
+                cols: 'Columns',
+                rows: 'Rows',
+                vals: 'Values',
+                defer: 'Defer Updates',
+                update: 'Update'
+            },
+            _ListContextMenu: {
+                up: 'Move Up',
+                down: 'Move Down',
+                first: 'Move to Beginning',
+                last: 'Move to End',
+                filter: 'Move to Report Filter',
+                rows: 'Move to Row Labels',
+                cols: 'Move to Column Labels',
+                vals: 'Move to Values',
+                remove: 'Remove Field',
+                edit: 'Field Settings…',
+                detail: 'Show Detail…'
+            },
+            PivotChart: {
+                by: 'by',
+                and: 'and'
+            },
+            DetailDialog: {
+                header: 'Detail View:',
+                ok: 'OK',
+                items: '{cnt:n0} items',
+                item: '{cnt} item',
+                row: 'Row',
+                col: 'Column'
+            }
+        },
+        Viewer: {
+            cancel: 'Cancel',
+            ok: 'OK',
+            bottom: 'Bottom:',
+            top: 'Top:',
+            right: 'Right:',
+            left: 'Left:',
+            margins: 'Margins (inches)',
+            orientation: 'Orientation:',
+            paperKind: 'Paper Kind:',
+            pageSetup: 'Page Setup',
+            landscape: 'Landscape',
+            portrait: 'Portrait',
+            pageNumber: 'Page Number',
+            zoomFactor: 'Zoom Factor',
+            paginated: 'Print Layout',
+            print: 'Print',
+            search: 'Search',
+            matchCase: 'Match case',
+            wholeWord: 'Match whole word only',
+            searchResults: 'Search Results',
+            previousPage: 'Previous Page',
+            nextPage: 'Next Page',
+            firstPage: 'First Page',
+            lastPage: 'Last Page',
+            backwardHistory: 'Backward',
+            forwardHistory: 'Forward',
+            pageCount: 'Page Count',
+            selectTool: 'Select Tool',
+            moveTool: 'Move Tool',
+            continuousMode: 'Continuous Page View',
+            singleMode: 'Single Page View',
+            wholePage: 'Fit Whole Page',
+            pageWidth: 'Fit Page Width',
+            zoomOut: 'Zoom Out',
+            zoomIn: 'Zoom In',
+            exports: 'Export',
+            fullScreen: 'Full Screen',
+            exitFullScreen: 'Exit Full Screen',
+            thumbnails: 'Page Thumbnails',
+            outlines: 'Document Map',
+            loading: 'Loading…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Web archive (MHTML)',
+            htmlExportName: 'HTML document',
+            rtfExportName: 'RTF document',
+            metafileExportName: 'Compressed metafiles',
+            csvExportName: 'CSV',
+            tiffExportName: 'Tiff images',
+            bmpExportName: 'BMP images',
+            emfExportName: 'Enhanced metafile',
+            gifExportName: 'GIF images',
+            jpgExportName: 'JPEG images',
+            jpegExportName: 'JPEG images',
+            pngExportName: 'PNG images',
+            parameters: 'Parameters',
+            requiringParameters: 'Please input parameters.',
+            nullParameterError: 'Value cannot be null.',
+            invalidParameterError: 'Invalid input.',
+            parameterNoneItemsSelected: '(none)',
+            parameterAllItemsSelected: '(all)',
+            parameterSelectAllItemText: '(Select All)',
+            selectParameterValue: '(select value)',
+            apply: 'Apply',
+            errorOccured: 'An error has occured.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.en.js.map
-

src/wijmo/controls/cultures/wijmo.culture.es.d.ts

@@ -1,13 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-

src/wijmo/controls/cultures/wijmo.culture.es.js

@@ -1,87 +1,279 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: es (Spanish)
-*/
-wijmo.culture = {
-    Globalize: {
-        numberFormat: {
-            '.': ',',
-            ',': '.',
-            percent: { pattern: ['-n %', 'n %'] },
-            currency: { decimals: 2, symbol: '€', pattern: ['-n $', 'n $'] }
+ * Wijmo culture file: es (Spanish)
+ */
+var wijmo;
+(function (wijmo) {
+    wijmo.culture = {
+        Globalize: {
+            name: 'es',
+            displayName: 'Spanish',
+            numberFormat: {
+                '.': ',',
+                ',': '.',
+                percent: { pattern: ['-n %', 'n %'] },
+                currency: { decimals: 2, symbol: '€', pattern: ['-n $', 'n $'] }
+            },
+            calendar: {
+                '/': '/',
+                ':': ':',
+                firstDay: 1,
+                days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
+                daysAbbr: ['do.', 'lu.', 'ma.', 'mi.', 'ju.', 'vi.', 'sá.'],
+                months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+                monthsAbbr: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.', 'sep.', 'oct.', 'nov.', 'dic.'],
+                am: ['', ''],
+                pm: ['', ''],
+                eras: ['d. C.'],
+                patterns: {
+                    d: 'dd/MM/yyyy', D: 'dddd, d" de "MMMM" de "yyyy',
+                    f: 'dddd, d" de "MMMM" de "yyyy H:mm', F: 'dddd, d" de "MMMM" de "yyyy H:mm:ss',
+                    t: 'H:mm', T: 'H:mm:ss',
+                    m: 'd" de "MMMM', M: 'd" de "MMMM',
+                    y: 'MMMM" de "yyyy', Y: 'MMMM" de "yyyy',
+                    g: 'dd/MM/yyyy H:mm', G: 'dd/MM/yyyy H:mm:ss',
+                    s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
+                },
+            }
+        },
+        MultiSelect: {
+            itemsSelected: '{count:n0} ítems seleccionados'
         },
-        calendar: {
-            '/': '/',
-            ':': ':',
-            firstDay: 1,
-            days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
-            daysAbbr: ['do.', 'lu.', 'ma.', 'mi.', 'ju.', 'vi.', 'sá.'],
-            months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
-            monthsAbbr: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.', 'sep.', 'oct.', 'nov.', 'dic.'],
-            am: ['', ''],
-            pm: ['', ''],
-            eras: ['d. C.'],
-            patterns: {
-                d: 'dd/MM/yyyy', D: 'dddd, d" de "MMMM" de "yyyy',
-                f: 'dddd, d" de "MMMM" de "yyyy H:mm', F: 'dddd, d" de "MMMM" de "yyyy H:mm:ss',
-                t: 'H:mm', T: 'H:mm:ss',
-                m: 'd" de "MMMM', M: 'd" de "MMMM',
-                y: 'MMMM" de "yyyy', Y: 'MMMM" de "yyyy',
-                g: 'dd/MM/yyyy H:mm', G: 'dd/MM/yyyy H:mm:ss',
-                s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
+        FlexGrid: {
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} ítems)'
+        },
+        FlexGridFilter: {
+            // filter
+            ascending: '\u2191 Ascendente',
+            descending: '\u2193 Descendente',
+            apply: 'Aplicar',
+            clear: 'Borrar',
+            conditions: 'Condiciones',
+            values: 'Valores',
+            // value filter
+            search: 'Filtro',
+            selectAll: 'Seleccionar todo',
+            null: '(nulo)',
+            // condition filter
+            header: 'Mostrar ítems donde el valor',
+            and: 'Y',
+            or: 'O',
+            stringOperators: [
+                { name: '(ninguno)', op: null },
+                { name: 'Es igual a', op: 0 },
+                { name: 'No es igual a', op: 1 },
+                { name: 'Comienza con', op: 6 },
+                { name: 'Termina con', op: 7 },
+                { name: 'Contiene', op: 8 },
+                { name: 'No contiene', op: 9 }
+            ],
+            numberOperators: [
+                { name: '(ninguno)', op: null },
+                { name: 'Es igual a', op: 0 },
+                { name: 'No es igual a', op: 1 },
+                { name: 'Es mayor que', op: 2 },
+                { name: 'Es mayor o igual a', op: 3 },
+                { name: 'Es menor que', op: 4 },
+                { name: 'Es menor o igual a', op: 5 }
+            ],
+            dateOperators: [
+                { name: '(ninguno)', op: null },
+                { name: 'Es igual a', op: 0 },
+                { name: 'es anterior a', op: 4 },
+                { name: 'es posterior a', op: 3 }
+            ],
+            booleanOperators: [
+                { name: '(ninguno)', op: null },
+                { name: 'Es igual a', op: 0 },
+                { name: 'No es igual a', op: 1 }
+            ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Configuración de los campos:',
+                header: 'Encabezado:',
+                summary: 'Resúmen:',
+                showAs: 'Mostrar como:',
+                weighBy: 'Pesar por:',
+                sort: 'Ordenar:',
+                filter: 'Filtrar:',
+                format: 'Formato:',
+                sample: 'Muestra:',
+                edit: 'Editar…',
+                clear: 'Borrar',
+                ok: 'Aceptar',
+                cancel: 'Cancelar',
+                none: '(ninguno)',
+                sorts: {
+                    asc: 'Ascendente',
+                    desc: 'Descendente'
+                },
+                aggs: {
+                    sum: 'Suma',
+                    cnt: 'Cantidad',
+                    avg: 'Promedio',
+                    max: 'Máximo',
+                    min: 'Mínimo',
+                    rng: 'Rango',
+                    std: 'StdDev',
+                    var: 'VAR',
+                    stdp: 'StdDevPop',
+                    varp: 'VarPop'
+                },
+                calcs: {
+                    noCalc: 'No Calcular',
+                    dRow: 'Diferencia con el renglón anterior',
+                    dRowPct: '% de diferencia con el renglón anterior',
+                    dCol: 'Diferencia con la columna anterior',
+                    dColPct: '% de diferencia con la columna anterior',
+                    dPctGrand: '% del gran total',
+                    dPctRow: '% del total del renglón',
+                    dPctCol: '% del total de la columna',
+                    dRunTot: 'Total acumulativo',
+                    dRunTotPct: '% del total acumulativo'
+                },
+                formats: {
+                    n0: 'Entero (n0)',
+                    n2: 'Decimal (n2)',
+                    c: 'Moneda (c)',
+                    p0: 'Porcentaje (p0)',
+                    p2: 'Porcentaje (p2)',
+                    n2c: 'Miles (n2,)',
+                    n2cc: 'Millones (n2,,)',
+                    n2ccc: 'Billones (n2,,,)',
+                    d: 'Fecha (d)',
+                    MMMMddyyyy: 'Mes día año (MMMM dd, yyyy)',
+                    dMyy: 'Día mes año (d/M/yy)',
+                    ddMyy: 'Día mes año (dd/M/yy)',
+                    dMyyyy: 'Día mes año (dd/M/yyyy)',
+                    MMMyyyy: 'Mes año (MMM yyyy)',
+                    MMMMyyyy: 'Mes año (MMMM yyyy)',
+                    yyyyQq: 'Cuatrimestre (yyyy "Q" q)',
+                    FYEEEEQU: 'Cuatrimestre fiscal ("FY" EEEE "Q" U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Total general',
+                subTotal: 'Subtotal'
+            },
+            PivotPanel: {
+                fields: 'Elegir campos para agregar al reporte:',
+                drag: 'Arrastrar campos entre las áreas debajo:',
+                filters: 'Filtros',
+                cols: 'Columnas',
+                rows: 'Renglones',
+                vals: 'Valores',
+                defer: 'Diferir actualizaciones',
+                update: 'Actualizar'
+            },
+            _ListContextMenu: {
+                up: 'Mover arriba',
+                down: 'Mover abajo',
+                first: 'Mover al principio',
+                last: 'Mover al final',
+                filter: 'Mover al filtro del reporte',
+                rows: 'Mover a las etiquetas del renglón',
+                cols: 'Mover a las etiquetas de la columna',
+                vals: 'Mover a los valores',
+                remove: 'Eliminar campo',
+                edit: 'Configuración de los campos…',
+                detail: 'Mostrar detalles…'
+            },
+            PivotChart: {
+                by: 'por',
+                and: 'y'
+            },
+            DetailDialog: {
+                header: 'Detalles:',
+                ok: 'Aceptar',
+                items: '{cnt:n0} ítems',
+                item: '{cnt} ítem',
+                row: 'Renglón',
+                col: 'Columna'
             }
+        },
+        Viewer: {
+            cancel: 'Cancelar',
+            ok: 'Aceptar',
+            bottom: 'Inferior:',
+            top: 'Superior:',
+            right: 'Derecha:',
+            left: 'Izquierda:',
+            margins: 'Márgenes (pulgadas)',
+            orientation: 'Orientación:',
+            paperKind: 'Tipo de papel:',
+            pageSetup: 'Configuración de página',
+            landscape: 'Horizontal',
+            portrait: 'Vertical',
+            pageNumber: 'Número de página',
+            zoomFactor: 'Factor de zoom',
+            paginated: 'Diseño de impresión',
+            print: 'Imprimir',
+            search: 'Buscar',
+            matchCase: 'Coincidir mayúsculas y minúsculas',
+            wholeWord: 'Sólo palabras completas',
+            searchResults: 'Resultados de la búsqueda',
+            previousPage: 'Página anterior',
+            nextPage: 'Página siguiente',
+            firstPage: 'Primera página',
+            lastPage: 'Última página',
+            backwardHistory: 'Hacia atrás',
+            forwardHistory: 'Adelante',
+            pageCount: 'Número de páginas',
+            selectTool: 'Seleccione la herramienta',
+            moveTool: 'Herramienta mover',
+            continuousMode: 'Continua la vista de página',
+            singleMode: 'Vista de página única',
+            wholePage: 'Ajuste toda la página',
+            pageWidth: 'Ajuste ancho de página',
+            zoomOut: 'Alejar',
+            zoomIn: 'Acercar',
+            exports: 'Exportar',
+            fullScreen: 'Pantalla completa',
+            exitFullScreen: 'Salir de pantalla completa',
+            thumbnails: 'Miniaturas de página',
+            outlines: 'Mapa del documento',
+            loading: 'Cargando…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Archivo de la web (MHTML)',
+            htmlExportName: 'Documento HTML',
+            rtfExportName: 'Documento RTF',
+            metafileExportName: 'Comprimido metarchivos',
+            csvExportName: 'CSV',
+            tiffExportName: 'Imágenes TIFF',
+            bmpExportName: 'Imágenes BMP',
+            emfExportName: 'Metarchivo mejorado',
+            gifExportName: 'Imágenes GIF',
+            jpgExportName: 'Imágenes JPEG',
+            jpegExportName: 'Imágenes JPEG',
+            pngExportName: 'Imágenes PNG',
+            parameters: 'Parámetros',
+            requiringParameters: 'Parámetros de entrada por favor.',
+            nullParameterError: 'El valor no puede ser nulo.',
+            invalidParameterError: 'Entrada no válida.',
+            parameterNoneItemsSelected: '(ninguno)',
+            parameterAllItemsSelected: '(todos)',
+            parameterSelectAllItemText: '(Seleccionar todo)',
+            selectParameterValue: '(seleccionar el valor)',
+            apply: 'Aplicar',
+            errorOccured: 'Se ha producido un error.'
         }
-    },
-    FlexGrid: {
-        groupHeaderFormat: '<b>{value} </b>({count:n0} ítems)'
-    },
-    FlexGridFilter: {
-        header: 'Mostrar ítems donde el valor',
-        and: 'Y',
-        or: 'O',
-        apply: 'Aplicar',
-        clear: 'Borrar',
-        stringOperators: [
-            { name: '(ninguno)', op: null },
-            { name: 'Es igual a', op: 0 },
-            { name: 'No es igual a', op: 1 },
-            { name: 'Comienza con x', op: 6 },
-            { name: 'Termina con', op: 7 },
-            { name: 'Contiene', op: 8 },
-            { name: 'No contiene', op: 9 }
-        ],
-        numberOperators: [
-            { name: '(ninguno)', op: null },
-            { name: 'Es igual a', op: 0 },
-            { name: 'No es igual a', op: 1 },
-            { name: 'Es mayor que', op: 2 },
-            { name: 'Es mayor que o igual a', op: 3 },
-            { name: 'Es menor que', op: 4 },
-            { name: 'Es menor que o igual a', op: 5 }
-        ],
-        dateOperators: [
-            { name: '(ninguno)', op: null },
-            { name: 'Es igual a', op: 0 },
-            { name: 'Es antes de', op: 4 },
-            { name: 'Es después de', op: 3 }
-        ],
-        booleanOperators: [
-            { name: '(ninguno)', op: null },
-            { name: 'Es igual a', op: 0 },
-            { name: 'No es igual a', op: 1 }
-        ]
-    }
-};
+    };
+})(wijmo || (wijmo = {}));
+;
 //# sourceMappingURL=wijmo.culture.es.js.map
-

src/wijmo/controls/cultures/wijmo.culture.fr.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.fr.js

@@ -1,22 +1,24 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: fr (French)
-*/
+ * Wijmo culture file: fr (French)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'fr',
+            displayName: 'French',
             numberFormat: {
                 '.': ',',
                 ',': ' ',
@@ -42,50 +44,236 @@ var wijmo;
                     y: 'MMMM yyyy', Y: 'MMMM yyyy',
                     g: 'dd/MM/yyyy HH:mm', G: 'dd/MM/yyyy HH:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} articles sélectionnés'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} articles)'
+            groupHeaderFormat: '{name} : <b>{value}</b> ({count:n0} articles)'
         },
         FlexGridFilter: {
-            header: 'Afficher articles où la valeur',
+            // filter
+            ascending: '\u2191 Ascendant',
+            descending: '\u2193 Descendant',
+            apply: 'Appliquer',
+            clear: 'Effacer',
+            conditions: 'Filtrer par condition',
+            values: 'Filtrer par valeur',
+            // value filter
+            search: 'Chercher',
+            selectAll: 'Sélectionner tout',
+            null: '(rien)',
+            // condition filter
+            header: 'Afficher les articles avec la valeur',
             and: 'Et',
             or: 'Ou',
-            apply: 'Appliquer',
-            clear: 'Supprimer',
             stringOperators: [
-                { name: '(Non définie)', op: null },
-                { name: 'Est égale à', op: 0 },
-                { name: 'N\'est pas égale à', op: 1 },
+                { name: '(non défini)', op: null },
+                { name: 'Est égal à', op: 0 },
+                { name: 'N\'est pas égal à', op: 1 },
                 { name: 'Commence par', op: 6 },
                 { name: 'Se termine par', op: 7 },
                 { name: 'Contient', op: 8 },
                 { name: 'Ne contient pas', op: 9 }
             ],
             numberOperators: [
-                { name: '(Non définie)', op: null },
-                { name: 'Est égale à', op: 0 },
-                { name: 'N\'est pas égale à', op: 1 },
-                { name: 'Est supérieure à', op: 2 },
-                { name: 'Est supérieure ou égale à', op: 3 },
-                { name: 'Est inférieure à', op: 4 },
-                { name: 'Est inférieure ou égale à', op: 5 }
+                { name: '(non défini)', op: null },
+                { name: 'Est égal à', op: 0 },
+                { name: 'N\'est pas égal à', op: 1 },
+                { name: 'Est supérieur à', op: 2 },
+                { name: 'Est supérieur ou égal à', op: 3 },
+                { name: 'Est inférieur à', op: 4 },
+                { name: 'Est inférieur ou égal à', op: 5 }
             ],
             dateOperators: [
-                { name: '(Non définie)', op: null },
-                { name: 'Est égale à', op: 0 },
+                { name: '(non défini)', op: null },
+                { name: 'Est égal à', op: 0 },
                 { name: 'Est avant', op: 4 },
                 { name: 'Est après', op: 3 }
             ],
             booleanOperators: [
-                { name: '(Non définie)', op: null },
-                { name: 'Est égale à', op: 0 },
-                { name: 'N\'est pas égale à', op: 1 }
+                { name: '(non défini)', op: null },
+                { name: 'Est égal à', op: 0 },
+                { name: 'N\'est pas égal à', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Paramètres de champ:',
+                header: 'En-tête:',
+                summary: 'Résumé:',
+                showAs: 'Afficher le statut:',
+                weighBy: 'Poids par:',
+                sort: 'Tri par:',
+                filter: 'Filtre:',
+                format: 'Mise en forme:',
+                sample: 'Aperçu:',
+                edit: 'Edit…',
+                clear: 'Effacer',
+                ok: 'OK',
+                cancel: 'Annuler',
+                none: '(néant)',
+                sorts: {
+                    asc: 'Ascendant',
+                    desc: 'Descendant'
+                },
+                aggs: {
+                    sum: 'Somme',
+                    cnt: 'Nombre',
+                    avg: 'Moyenne',
+                    max: 'Max',
+                    min: 'Min',
+                    rng: 'Plage',
+                    std: 'Écartype',
+                    var: 'Var',
+                    stdp: 'StdDevPop',
+                    varp: 'VarPop'
+                },
+                calcs: {
+                    noCalc: 'Aucun calcul',
+                    dRow: 'Différence du rang précédent',
+                    dRowPct: 'Pourcentage de différence du rang précédent',
+                    dCol: 'Différence de la colonne précédente',
+                    dColPct: 'Pourcentage de différence de la colonne précédente',
+                    dPctGrand: '% du total général',
+                    dPctRow: '% du total de ligne',
+                    dPctCol: '% de colonne total',
+                    dRunTot: 'Total cumulé',
+                    dRunTotPct: '% total cumulé'
+                },
+                formats: {
+                    n0: 'Entier (n0)',
+                    n2: 'Décimal (n2)',
+                    c: 'Monnaie (c)',
+                    p0: 'Pourcentage (p0)',
+                    p2: 'Pourcentage (p2)',
+                    n2c: 'Des milliers (n2,)',
+                    n2cc: 'Des millions (n2,,)',
+                    n2ccc: 'Des milliards (n2,,,)',
+                    d: 'Date (d)',
+                    MMMMddyyyy: 'Mois jour année (MMMM dd, yyyy)',
+                    dMyy: 'Jour mois année (d/M/yy)',
+                    ddMyy: 'Jour mois année (dd/M/yy)',
+                    dMyyyy: 'Jour mois année (dd/M/yyyy)',
+                    MMMyyyy: 'Mois année (MMM yyyy)',
+                    MMMMyyyy: 'Mois année (MMMM yyyy)',
+                    yyyyQq: 'Trimestre de l’année (yyyy "Q"q)',
+                    FYEEEEQU: 'Trimestre de l’exercice ("FY" EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Total général',
+                subTotal: 'Sous-total'
+            },
+            PivotPanel: {
+                fields: 'Choisissez les champs à ajouter au rapport:',
+                drag: 'Faites glisser les champs dans les zones voulues ci-dessous:',
+                filters: 'Filtres',
+                cols: 'Colonnes',
+                rows: 'Lignes',
+                vals: 'Valeurs',
+                defer: 'Reporter les mises à jour',
+                update: 'Mettre à jour'
+            },
+            _ListContextMenu: {
+                up: 'Monter',
+                down: 'Descendre',
+                first: 'Déplacer au début',
+                last: 'Déplacer à la fin',
+                filter: 'Déplacer dans la zone Filtre du rapport',
+                rows: 'Déplacer dans la zone Étiquettes de lignes',
+                cols: 'Déplacer dans la zone Étiquettes de colonnes',
+                vals: 'Déplacer dans la zone Valeurs',
+                remove: 'Supprimer le champ',
+                edit: 'Paramètres de champ…',
+                detail: 'Afficher le détail…'
+            },
+            PivotChart: {
+                by: 'par',
+                and: 'et'
+            },
+            DetailDialog: {
+                header: 'Vue de détail:',
+                ok: 'OK',
+                items: 'éléments de {cnt:n0}',
+                item: 'élément de {cnt}',
+                row: 'Ligne',
+                col: 'Colonne'
+            }
+        },
+        Viewer: {
+            cancel: 'Annuler',
+            ok: 'OK',
+            bottom: 'Bas:',
+            top: 'Haut:',
+            right: 'Droite:',
+            left: 'Gauche:',
+            margins: 'Marges (pouces)',
+            orientation: 'Orientation:',
+            paperKind: 'Type de papier:',
+            pageSetup: 'Configuration page',
+            landscape: 'Paysage',
+            portrait: 'Portrait',
+            pageNumber: 'Numéro de page',
+            zoomFactor: 'Facteur de zoom',
+            paginated: 'Mode Page',
+            print: 'Impression',
+            search: 'Chercher',
+            matchCase: 'Respecter la casse',
+            wholeWord: 'Mot entier uniquement',
+            searchResults: 'Résultats de la recherche',
+            previousPage: 'Page précédente',
+            nextPage: 'Page suivante',
+            firstPage: 'Première page',
+            lastPage: 'Dernière page',
+            backwardHistory: 'Backward',
+            forwardHistory: 'Transférer',
+            pageCount: 'Nombre de pages',
+            selectTool: 'Sélectionnez l’outil',
+            moveTool: 'Outil de déplacement',
+            continuousMode: 'Affichage de la Page continue',
+            singleMode: 'Affichage de Page simple',
+            wholePage: 'Toute forme de la Page',
+            pageWidth: 'Largeur de la Page',
+            zoomOut: 'Rétrécir',
+            zoomIn: 'Effectuez un zoom avant',
+            exports: 'Exporter',
+            fullScreen: 'Plein écran',
+            exitFullScreen: 'Quitter le mode plein écran',
+            thumbnails: 'Vignettes de page',
+            outlines: 'Explorateur de documents',
+            loading: 'Chargement…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Archive Web (MHTML)',
+            htmlExportName: 'Document HTML',
+            rtfExportName: 'Document RTF',
+            metafileExportName: 'Métafichiers compressés',
+            csvExportName: 'CSV',
+            tiffExportName: 'Images TIFF',
+            bmpExportName: 'Images BMP',
+            emfExportName: 'Métafichier amélioré',
+            gifExportName: 'Images GIF',
+            jpgExportName: 'Images JPEG',
+            jpegExportName: 'Images JPEG',
+            pngExportName: 'Images PNG',
+            parameters: 'Paramètres',
+            requiringParameters: 'Entrer des paramètres.',
+            nullParameterError: 'La valeur ne peut pas être null.',
+            invalidParameterError: 'Entrée non valide.',
+            parameterNoneItemsSelected: '(néant)',
+            parameterAllItemsSelected: '(tous)',
+            parameterSelectAllItemText: '(Sélectionner tout)',
+            selectParameterValue: '(sélectionnez valeur)',
+            apply: 'Appliquer',
+            errorOccured: 'Une erreur s\'est produite.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.fr.js.map
-

src/wijmo/controls/cultures/wijmo.culture.it.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.it.js

@@ -1,27 +1,29 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: it (Italian)
-*/
+ * Wijmo culture file: it (Italian)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'it',
+            displayName: 'Italian',
             numberFormat: {
                 '.': ',',
                 ',': '.',
                 percent: { pattern: ['-n%', 'n%'] },
-                currency: { decimals: 2, symbol: '€', pattern: ['-$ n', '$ n'] }
+                currency: { decimals: 2, symbol: '€', pattern: ['-n $', 'n $'] }
             },
             calendar: {
                 '/': '/',
@@ -42,50 +44,236 @@ var wijmo;
                     y: 'MMMM yyyy', Y: 'MMMM yyyy',
                     g: 'dd/MM/yyyy HH:mm', G: 'dd/MM/yyyy HH:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} elementi selezionati'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} articoli)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} elementi)'
         },
         FlexGridFilter: {
-            header: 'Mostra elementi in cui il valore',
-            and: 'E',
-            or: 'O',
+            // filter
+            ascending: '\u2191 Crescente',
+            descending: '\u2193 Decrescente',
             apply: 'Applica',
-            clear: 'Rimuovi',
+            clear: 'Cancella',
+            conditions: 'Filtra per Condizione',
+            values: 'Filtra per valore',
+            // value filter
+            search: 'Cerca',
+            selectAll: 'Seleziona tutto',
+            null: '(niente)',
+            // condition filter
+            header: 'Mostra elementi dove il valore',
+            and: 'E',
+            or: 'Oppure',
             stringOperators: [
-                { name: '(Non impostato)', op: null },
-                { name: 'È uguale a', op: 0 },
-                { name: 'Non è uguale a', op: 1 },
+                { name: '(non impostato)', op: null },
+                { name: 'Uguale a', op: 0 },
+                { name: 'Diverso da', op: 1 },
                 { name: 'Inizia con', op: 6 },
-                { name: 'Finisce per', op: 7 },
+                { name: 'Termina con', op: 7 },
                 { name: 'Contiene', op: 8 },
                 { name: 'Non contiene', op: 9 }
             ],
             numberOperators: [
-                { name: '(Non impostato)', op: null },
-                { name: 'È uguale a', op: 0 },
-                { name: 'Non è uguale a', op: 1 },
-                { name: 'È maggiore di', op: 2 },
-                { name: 'È maggiore di o uguale a', op: 3 },
-                { name: 'È minore di', op: 4 },
-                { name: 'È minore di o uguale a', op: 5 }
+                { name: '(non impostato)', op: null },
+                { name: 'Uguale a', op: 0 },
+                { name: 'Diverso da', op: 1 },
+                { name: 'Maggiore di', op: 2 },
+                { name: 'Maggiore o uguale a', op: 3 },
+                { name: 'Minore di', op: 4 },
+                { name: 'Minore o uguale a', op: 5 }
             ],
             dateOperators: [
-                { name: '(Non impostato)', op: null },
-                { name: 'È uguale a', op: 0 },
+                { name: '(non impostato)', op: null },
+                { name: 'Uguale a', op: 0 },
                 { name: 'Prima di', op: 4 },
                 { name: 'Dopo', op: 3 }
             ],
             booleanOperators: [
-                { name: '(Non impostato)', op: null },
-                { name: 'È uguale a', op: 0 },
-                { name: 'Non è uguale a', op: 1 }
+                { name: '(non impostato)', op: null },
+                { name: 'Uguale a', op: 0 },
+                { name: 'Diverso da', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Impostazioni del campo:',
+                header: 'Intestazione:',
+                summary: 'Sunto:',
+                showAs: 'Visualizza come:',
+                weighBy: 'Pesare da:',
+                sort: 'Ordinamento:',
+                filter: 'Filtro:',
+                format: 'Formato:',
+                sample: 'Esempio:',
+                edit: 'Modifica…',
+                clear: 'Cancella',
+                ok: 'OK',
+                cancel: 'Annulla',
+                none: '(nessuno)',
+                sorts: {
+                    asc: 'Crescente',
+                    desc: 'Decrescente'
+                },
+                aggs: {
+                    sum: 'Somma',
+                    cnt: 'Conteggio',
+                    avg: 'Media',
+                    max: 'Max',
+                    min: 'Min',
+                    rng: 'Intervallo',
+                    std: 'Dev. Standard',
+                    var: 'Varianza',
+                    stdp: 'Dev. StandardP',
+                    varp: 'VarianzaP'
+                },
+                calcs: {
+                    noCalc: 'Nessun calcolo',
+                    dRow: 'Differenza della riga precedente',
+                    dRowPct: '% Differenza dalla riga precedente',
+                    dCol: 'Differenza dalla colonna precedente',
+                    dColPct: '% Differenza dalla colonna precedente',
+                    dPctGrand: '% del totale complessivo',
+                    dPctRow: '% di riga totale',
+                    dPctCol: '% della colonna totale',
+                    dRunTot: 'Totale parziale',
+                    dRunTotPct: '% totale parziale'
+                },
+                formats: {
+                    n0: 'Intero (n0)',
+                    n2: 'Decimale (n2)',
+                    c: 'Valuta (c)',
+                    p0: 'Percentuale (p0)',
+                    p2: 'Percentuale (p2)',
+                    n2c: 'Migliaia (n2,)',
+                    n2cc: 'Milioni (n2,,)',
+                    n2ccc: 'Miliardi (n2,,,)',
+                    d: 'Data (d)',
+                    MMMMddyyyy: 'Mese giorno anno (MMMM dd, yyyy)',
+                    dMyy: 'Giorno mese anno (d/M/yy)',
+                    ddMyy: 'Giorno mese anno (dd/M/yy)',
+                    dMyyyy: 'Giorno mese anno (dd/M/yyyy)',
+                    MMMyyyy: 'Mese anno (MMM yyyy)',
+                    MMMMyyyy: 'Mese anno (MMMM yyyy)',
+                    yyyyQq: 'Trimestre (yyyy "Q" q)',
+                    FYEEEEQU: 'Trimestre fiscale ("FY" EEEE "Q" U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Totale complessivo',
+                subTotal: 'Subtotale'
+            },
+            PivotPanel: {
+                fields: 'Scegliere i campi da aggiungere al report:',
+                drag: 'Trascinare i campi nelle aree sottostanti:',
+                filters: 'Filtri',
+                cols: 'Colonne',
+                rows: 'Righe',
+                vals: 'Valori',
+                defer: 'Rinviare gli aggiornamenti',
+                update: 'Aggiorna'
+            },
+            _ListContextMenu: {
+                up: 'Sposta su',
+                down: 'Sposta giù',
+                first: 'Sposta all\'inizio',
+                last: 'Sposta alla fine',
+                filter: 'Sposta nel filtro per il rapporto',
+                rows: 'Sposta nelle etichette di riga',
+                cols: 'Sposta nelle etichette di colonna',
+                vals: 'Sposta nei valori',
+                remove: 'Rimuovi campo',
+                edit: 'Impostazioni campo…',
+                detail: 'Visualizza dettaglio…'
+            },
+            PivotChart: {
+                by: 'per',
+                and: 'e'
+            },
+            DetailDialog: {
+                header: 'Vista di dettaglio:',
+                ok: 'OK',
+                items: 'elementi di {cnt:n0}',
+                item: 'elemento di {cnt}',
+                row: 'Riga',
+                col: 'Colonna'
+            }
+        },
+        Viewer: {
+            cancel: 'Annulla',
+            ok: 'OK',
+            bottom: 'Inferiore:',
+            top: 'Superiore:',
+            right: 'Destra:',
+            left: 'Sinistra:',
+            margins: 'Margini (pollici)',
+            orientation: 'Orientamento:',
+            paperKind: 'Tipo di carta:',
+            pageSetup: 'Imposta pagina',
+            landscape: 'Orizzontale',
+            portrait: 'Verticale',
+            pageNumber: 'Numero di pagina',
+            zoomFactor: 'Fattore di ingrandimento',
+            paginated: 'Layout di stampa',
+            print: 'Stampare',
+            search: 'Cerca',
+            matchCase: 'Maiuscole/minuscole',
+            wholeWord: 'Solo parole intere',
+            searchResults: 'Risultati ricerca',
+            previousPage: 'Pagina precedente',
+            nextPage: 'Pagina successiva',
+            firstPage: 'Prima pagina',
+            lastPage: 'Ultima pagina',
+            backwardHistory: 'Indietro',
+            forwardHistory: 'Avanti',
+            pageCount: 'Conteggio pagine',
+            selectTool: 'Selezionare strumento',
+            moveTool: 'Strumento sposta',
+            continuousMode: 'Vista pagina continua',
+            singleMode: 'Visualizzazione a pagina singola',
+            wholePage: 'Adatta pagina intera',
+            pageWidth: 'Misura la larghezza della pagina',
+            zoomOut: 'Riduci',
+            zoomIn: 'Ingrandisci',
+            exports: 'Esporta',
+            fullScreen: 'Schermo intero',
+            exitFullScreen: 'Chiudi visualizzazione schermo intero',
+            thumbnails: 'Miniature di pagina',
+            outlines: 'Struttura del documento',
+            loading: 'Caricamento…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Archivio Web (MHTML)',
+            htmlExportName: 'Documento HTML',
+            rtfExportName: 'Documento RTF',
+            metafileExportName: 'Metafile compresso',
+            csvExportName: 'CSV',
+            tiffExportName: 'Immagini TIFF',
+            bmpExportName: 'Immagini BMP',
+            emfExportName: 'Metafile avanzato',
+            gifExportName: 'Immagini GIF',
+            jpgExportName: 'Immagini JPEG',
+            jpegExportName: 'Immagini JPEG',
+            pngExportName: 'Immagini PNG',
+            parameters: 'Parameters',
+            requiringParameters: 'Parametri di input per favore.',
+            nullParameterError: 'Il valore non può essere null.',
+            invalidParameterError: 'Input non valido.',
+            parameterNoneItemsSelected: '(nessuno)',
+            parameterAllItemsSelected: '(tutti)',
+            parameterSelectAllItemText: '(Seleziona tutto)',
+            selectParameterValue: '(selezionare valore)',
+            apply: 'Applica',
+            errorOccured: 'Si è verificato un errore.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.it.js.map
-

src/wijmo/controls/cultures/wijmo.culture.ja.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.ja.js

@@ -1,22 +1,24 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: ja (Japanese)
-*/
+ * Wijmo culture file: ja (Japanese)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'ja',
+            displayName: 'Japanese',
             numberFormat: {
                 '.': '.',
                 ',': ',',
@@ -31,9 +33,8 @@ var wijmo;
                 daysAbbr: ['日', '月', '火', '水', '木', '金', '土'],
                 months: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
                 monthsAbbr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-                am: ['午前', '午'],
-                pm: ['午後', '午'],
-                //eras: ['西暦'],
+                am: ['午前', '午前'],
+                pm: ['午後', '午後'],
                 eras: [
                     { name: '平成', symbol: 'H', start: new Date(1989, 0, 8) },
                     { name: '昭和', symbol: 'S', start: new Date(1926, 11, 25) },
@@ -41,25 +42,39 @@ var wijmo;
                     { name: '明治', symbol: 'M', start: new Date(1868, 8, 8) }
                 ],
                 patterns: {
-                    d: 'yyyy/M/d', D: 'yyyy"年"M"月"d"日"',
+                    d: 'yyyy/MM/dd', D: 'yyyy"年"M"月"d"日"',
                     f: 'yyyy"年"M"月"d"日" H:mm', F: 'yyyy"年"M"月"d"日" H:mm:ss',
                     t: 'H:mm', T: 'H:mm:ss',
                     m: 'M"月"d"日"', M: 'M"月"d"日"',
                     y: 'yyyy"年"M"月"', Y: 'yyyy"年"M"月"',
-                    g: 'yyyy/M/d H:mm', G: 'yyyy/M/d H:mm:ss',
-                    s: 'yyyy"-"M"-"d"T"HH":"mm":"ss'
-                }
+                    g: 'yyyy/MM/dd H:mm', G: 'yyyy/MM/dd H:mm:ss',
+                    s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
+                },
+                fiscalYearOffsets: [3, 0]
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} 個の項目を選択中'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} 項目)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} 項目)'
         },
         FlexGridFilter: {
+            // filter
+            ascending: '\u2191 昇順',
+            descending: '\u2193 降順',
+            apply: '適用',
+            clear: 'クリア',
+            conditions: '条件フィルタ',
+            values: '値フィルタ',
+            // value filter
+            search: '検索',
+            selectAll: 'すべて選択',
+            null: '(なし)',
+            // condition filter
             header: '抽出条件の指定',
             and: 'AND',
             or: 'OR',
-            apply: '適用',
-            clear: 'リセット',
             stringOperators: [
                 { name: '(設定しない)', op: null },
                 { name: '指定の値に等しい', op: 0 },
@@ -81,17 +96,190 @@ var wijmo;
             dateOperators: [
                 { name: '(設定しない)', op: null },
                 { name: '指定の値に等しい', op: 0 },
-                { name: '前である', op: 4 },
-                { name: 'の後である', op: 3 }
+                { name: '指定の値より前', op: 4 },
+                { name: '指定の値より後', op: 3 }
             ],
             booleanOperators: [
                 { name: '(設定しない)', op: null },
                 { name: '指定の値に等しい', op: 0 },
                 { name: '指定の値に等しくない', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'フィールドの設定:',
+                header: 'ヘッダー:',
+                summary: '集計方法:',
+                showAs: '計算の種類:',
+                weighBy: '基準フィールド:',
+                sort: '並べ替え:',
+                filter: 'フィルター:',
+                format: '表示形式:',
+                sample: 'サンプル:',
+                edit: '編集…',
+                clear: 'クリア',
+                ok: 'OK',
+                cancel: 'キャンセル',
+                none: '(なし)',
+                sorts: {
+                    asc: '昇順',
+                    desc: '降順'
+                },
+                aggs: {
+                    sum: '合計',
+                    cnt: '個数',
+                    avg: '平均',
+                    max: '最大値',
+                    min: '最小値',
+                    rng: '範囲',
+                    std: '標準偏差',
+                    var: '標本分散',
+                    stdp: '標準偏差',
+                    varp: '分散'
+                },
+                calcs: {
+                    noCalc: '計算なし',
+                    dRow: '前の行との差分',
+                    dRowPct: '前の行との差分の比率',
+                    dCol: '前の列との差分',
+                    dColPct: '前の列との差分の比率',
+                    dPctGrand: '総合計の %',
+                    dPctRow: '行の合計の %',
+                    dPctCol: '列の合計の %',
+                    dRunTot: '実行中の合計',
+                    dRunTotPct: '積算合計の %'
+                },
+                formats: {
+                    n0: '整数 (n0)',
+                    n2: '小数 (n2)',
+                    c: '通貨 (c)',
+                    p0: 'パーセンテージ (p0)',
+                    p2: 'パーセンテージ (p2)',
+                    n2c: '千 (n2,)',
+                    n2cc: '100万 (n2,,)',
+                    n2ccc: '10億 (n2,,,)',
+                    d: '日付 (d)',
+                    MMMMddyyyy: '月 日 年 (MMMM dd, yyyy)',
+                    dMyy: '日 月 年 (d/M/yy)',
+                    ddMyy: '日 月 年 (dd/M/yy)',
+                    dMyyyy: '日 月 年 (dd/M/yyyy)',
+                    MMMyyyy: '月 年 (MMM yyyy)',
+                    MMMMyyyy: '月 年 (MMMM yyyy)',
+                    yyyyQq: '年 四半期 (yyyy "Q"q)',
+                    FYEEEEQU: '会計年度 四半期 ("FY"EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: '総計',
+                subTotal: '集計'
+            },
+            PivotPanel: {
+                fields: 'レポートに追加するフィールドを選択:',
+                drag: '次のボックス間でフィールドをドラッグ:',
+                filters: 'フィルター',
+                cols: '列',
+                rows: '行',
+                vals: '値',
+                defer: 'レイアウトの更新を保留',
+                update: '更新'
+            },
+            _ListContextMenu: {
+                up: '上へ移動',
+                down: '下へ移動',
+                first: '先頭へ移動',
+                last: '末尾へ移動',
+                filter: 'レポートフィルターに移動',
+                rows: '行ラベルに移動',
+                cols: '列ラベルに移動',
+                vals: '値に移動',
+                remove: 'フィールドの削除',
+                edit: 'フィールドの設定…',
+                detail: '詳細の表示…'
+            },
+            PivotChart: {
+                by: ':',
+                and: '/'
+            },
+            DetailDialog: {
+                header: '詳細ビュー:',
+                ok: 'OK',
+                items: '{cnt:n0} 項目',
+                item: '{cnt} 項目',
+                row: '行',
+                col: '列'
+            }
+        },
+        Viewer: {
+            cancel: 'キャンセル',
+            ok: 'OK',
+            bottom: '下:',
+            top: '上:',
+            right: '右:',
+            left: '左:',
+            margins: '余白 (インチ)',
+            orientation: '向き:',
+            paperKind: '用紙の種類:',
+            pageSetup: 'ページ設定',
+            landscape: '横',
+            portrait: '縦',
+            pageNumber: 'ページ番号',
+            zoomFactor: 'ズーム要素',
+            paginated: '印刷レイアウト',
+            print: '印刷',
+            search: '検索',
+            matchCase: '大文字と小文字を区別する',
+            wholeWord: '単語単位で探す',
+            searchResults: '検索結果',
+            previousPage: '前のページ',
+            nextPage: '次のページ',
+            firstPage: '最初のページ',
+            lastPage: '最後のページ',
+            backwardHistory: '前へ',
+            forwardHistory: '進む',
+            pageCount: 'ページ数',
+            selectTool: 'ツールを選択します。',
+            moveTool: '移動ツール',
+            continuousMode: '連続ページ表示',
+            singleMode: '1 つのページ ビュー',
+            wholePage: 'ページ全体',
+            pageWidth: 'ページ幅に合わせる',
+            zoomOut: '縮小',
+            zoomIn: '拡大',
+            exports: 'エクスポート',
+            fullScreen: '全画面表示',
+            exitFullScreen: '全画面表示の終了',
+            thumbnails: 'ページのサムネイル',
+            outlines: '見出しマップ',
+            loading: '読み込んでいます…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML ワード',
+            xlsxExportName: 'オープン XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Web アーカイブ (MHTML)',
+            htmlExportName: 'HTML ドキュメント',
+            rtfExportName: 'Rtf 形式のドキュメント',
+            metafileExportName: '圧縮されたメタファイル',
+            csvExportName: 'CSV',
+            tiffExportName: 'Tiff イメージ',
+            bmpExportName: 'BMP 画像',
+            emfExportName: '拡張メタファイル',
+            gifExportName: 'GIF 画像',
+            jpgExportName: 'JPEG 画像',
+            jpegExportName: 'JPEG 画像',
+            pngExportName: 'Png 形式の画像',
+            parameters: 'パラメーター',
+            requiringParameters: 'パラメーターを入力してください。',
+            nullParameterError: '値を null にすることはできません。',
+            invalidParameterError: '入力が無効です。',
+            parameterNoneItemsSelected: '(下線なし)',
+            parameterAllItemsSelected: '(すべて)',
+            parameterSelectAllItemText: '(すべての選択)',
+            selectParameterValue: '(値を選択)',
+            apply: '適用',
+            errorOccured: 'エラーが発生しました。'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.ja.js.map
-

src/wijmo/controls/cultures/wijmo.culture.ko.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.ko.js

@@ -1,26 +1,28 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: ko (Korean)
-*/
+ * Wijmo culture file: ko (Korean)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'ko',
+            displayName: 'Korean',
             numberFormat: {
                 '.': '.',
                 ',': ',',
-                percent: { pattern: ['-n %', 'n %'] },
+                percent: { pattern: ['-n%', 'n%'] },
                 currency: { decimals: 0, symbol: '₩', pattern: ['-$n', '$n'] }
             },
             calendar: {
@@ -31,8 +33,8 @@ var wijmo;
                 daysAbbr: ['일', '월', '화', '수', '목', '금', '토'],
                 months: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
                 monthsAbbr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-                am: ['오전', '오'],
-                pm: ['오후', '오'],
+                am: ['오전', '오전'],
+                pm: ['오후', '오후'],
                 eras: ['서기'],
                 patterns: {
                     d: 'yyyy-MM-dd', D: 'yyyy"년" M"월" d"일" dddd',
@@ -42,50 +44,236 @@ var wijmo;
                     y: 'yyyy"년" M"월"', Y: 'yyyy"년" M"월"',
                     g: 'yyyy-MM-dd tt h:mm', G: 'yyyy-MM-dd tt h:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} 항목 선택'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} 항목)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} 항목)'
         },
         FlexGridFilter: {
-            header: '자료 행 보기',
-            and: '그리고',
-            or: '또는',
+            // filter
+            ascending: '\u2191 상승',
+            descending: '\u2193 하락',
             apply: '적용',
-            clear: '확인',
+            clear: '지움',
+            conditions: '조건에 따른 필터',
+            values: '값에 따른 필터',
+            // value filter
+            search: '검색',
+            selectAll: '모두 선택',
+            null: '(없음)',
+            // condition filter
+            header: '항목 표시: 값이',
+            and: '및',
+            or: '또는',
             stringOperators: [
-                { name: '(설정되지 않음)', op: null },
-                { name: '같음', op: 0 },
-                { name: '같지 않음', op: 1 },
-                { name: '로 시작', op: 6 },
-                { name: '로 엔드', op: 7 },
-                { name: '포함', op: 8 },
-                { name: '포함하지 않음', op: 9 }
+                { name: '(설정 되지 않음)', op: null },
+                { name: '다음과 같을 경우', op: 0 },
+                { name: '다음과 같지 않을 경우', op: 1 },
+                { name: '다음의 값으로 시작하는 경우', op: 6 },
+                { name: '다음의 값으로 끝나는 경우', op: 7 },
+                { name: '다음의 값을 포함하는 경우', op: 8 },
+                { name: '다음의 값을 포함하지 않는 경우', op: 9 }
             ],
             numberOperators: [
-                { name: '(설정되지 않음)', op: null },
-                { name: '같음', op: 0 },
-                { name: '같지 않음', op: 1 },
-                { name: '보다 큼', op: 2 },
-                { name: '크거나 같음', op: 3 },
-                { name: '보다 작음', op: 4 },
-                { name: '작거나 같음', op: 5 }
+                { name: '(설정 되지 않음)', op: null },
+                { name: '다음과 같을 경우', op: 0 },
+                { name: '다음과 같지 않을 경우', op: 1 },
+                { name: '다음의 값보다 큰 경우', op: 2 },
+                { name: '다음의 값보다 크거나 같은 경우', op: 3 },
+                { name: '다음의 값보다 작은 경우', op: 4 },
+                { name: '다음의 값보다 작거나 같은 경우', op: 5 }
             ],
             dateOperators: [
-                { name: '(설정되지 않음)', op: null },
-                { name: '같음', op: 0 },
-                { name: '전에', op: 4 },
-                { name: '후', op: 3 }
+                { name: '(설정 되지 않음)', op: null },
+                { name: '다음과 같을 경우', op: 0 },
+                { name: '다음의 값보다 앞에 있는 경우', op: 4 },
+                { name: '다음의 값보다 뒤에 있는 경우', op: 3 }
             ],
             booleanOperators: [
-                { name: '(설정되지 않음)', op: null },
-                { name: '같음', op: 0 },
-                { name: '같지 않음', op: 1 }
+                { name: '(설정 되지 않음)', op: null },
+                { name: '다음과 같을 경우', op: 0 },
+                { name: '다음과 같지 않을 경우', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: '필드 설정:',
+                header: '헤더:',
+                summary: '요약:',
+                showAs: '표시:',
+                weighBy: '여 무게:',
+                sort: '정렬:',
+                filter: '필터:',
+                format: '형식:',
+                sample: '미리 보기:',
+                edit: '편집…',
+                clear: '지우기',
+                ok: '확인',
+                cancel: '취소',
+                none: '(없음)',
+                sorts: {
+                    asc: '오름차순',
+                    desc: '내림차순'
+                },
+                aggs: {
+                    sum: '합계',
+                    cnt: '개수',
+                    avg: '평균',
+                    max: 'MAX',
+                    min: 'MIN',
+                    rng: '범위',
+                    std: '표본_표준_편차',
+                    var: 'VAR',
+                    stdp: 'StdDevPop',
+                    varp: 'VarPop'
+                },
+                calcs: {
+                    noCalc: '계산 없음',
+                    dRow: '이전 행에서 차이',
+                    dRowPct: '% 이전 행에서 차이',
+                    dCol: '이전 열에서 차이',
+                    dColPct: '% 이전 열에서 차이',
+                    dPctGrand: '그랜드 합계의 %',
+                    dPctRow: '행 합계의 %',
+                    dPctCol: '열 합계의 %',
+                    dRunTot: '누적 합계',
+                    dRunTotPct: '% 누적 합계'
+                },
+                formats: {
+                    n0: '정수 (n0)',
+                    n2: '진수 (n2)',
+                    c: '통화 (c)',
+                    p0: '비율 (p0)',
+                    p2: '비율 (p2)',
+                    n2c: '수천 (n2,)',
+                    n2cc: '수백만 (n2,,)',
+                    n2ccc: '수십억 (n2,,,)',
+                    d: '날짜 (d)',
+                    MMMMddyyyy: '월 일 년 (MMMM dd, yyyy)',
+                    dMyy: '일 월 년 (d/M/yy)',
+                    ddMyy: '일 월 년 (dd/M/yy)',
+                    dMyyyy: '일 월 년 (M/dd/yyyy)',
+                    MMMyyyy: '달 년 (MMM yyyy)',
+                    MMMMyyyy: '달 년 (MMMM yyyy)',
+                    yyyyQq: '올해 분기 (yyyy "Q" q)',
+                    FYEEEEQU: '회계 연도 분기 ("년도" EEEE "Q" U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: '총합계',
+                subTotal: '부분합'
+            },
+            PivotPanel: {
+                fields: '보고서에 추가할 필드 선택:',
+                drag: '아래 영역 사이에 필드를 끌어 놓으십시오:',
+                filters: '필터',
+                cols: '열',
+                rows: '행',
+                vals: '값',
+                defer: '업데이트 지연',
+                update: '업데이트'
+            },
+            _ListContextMenu: {
+                up: '위로 이동',
+                down: '아래로 이동',
+                first: '처음으로 이동',
+                last: '끝으로 이동',
+                filter: '보고서 필터로 이동',
+                rows: '행 레이블로 이동',
+                cols: '열 레이블로 이동',
+                vals: '값으로 이동',
+                remove: '필드 제거',
+                edit: '필드 설정…',
+                detail: '자세히 보기…'
+            },
+            PivotChart: {
+                by: '기준',
+                and: 'and'
+            },
+            DetailDialog: {
+                header: '세부 정보 보기:',
+                ok: '확인',
+                items: '{cnt:n0} 항목',
+                item: '{cnt} 항목',
+                row: 'Row',
+                col: '세로 막대형'
+            }
+        },
+        Viewer: {
+            cancel: '취소',
+            ok: '확인',
+            bottom: '아래쪽:',
+            top: '위쪽:',
+            right: '오른쪽:',
+            left: '왼쪽:',
+            margins: '여백(인치)',
+            orientation: '방향:',
+            paperKind: '종이 종류:',
+            pageSetup: '설정 페이지',
+            landscape: '가로',
+            portrait: '세로',
+            pageNumber: '페이지 번호',
+            zoomFactor: '확대/축소 비율',
+            paginated: '인쇄 레이아웃',
+            print: '인쇄',
+            search: '검색',
+            matchCase: '대/소문자 구분',
+            wholeWord: '단어 단위로',
+            searchResults: '검색 결과',
+            previousPage: '이전 페이지',
+            nextPage: '다음 페이지',
+            firstPage: '첫 페이지',
+            lastPage: '마지막 페이지',
+            backwardHistory: '뒤로',
+            forwardHistory: '앞으로',
+            pageCount: '페이지 수',
+            selectTool: '도구 선택',
+            moveTool: '이동 도구',
+            continuousMode: '연속 페이지 보기',
+            singleMode: '단일 페이지 보기',
+            wholePage: '전체 페이지를 맞춤된',
+            pageWidth: '페이지 너비에 맞게',
+            zoomOut: '축소',
+            zoomIn: '확대',
+            exports: '내보내기',
+            fullScreen: '전체 화면',
+            exitFullScreen: '전체 화면 끝내기',
+            thumbnails: '페이지 축소판',
+            outlines: '문서 구조',
+            loading: '로드 중입니다…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML 워드',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: '웹 보관 파일 (MHTML)',
+            htmlExportName: 'HTML 문서',
+            rtfExportName: 'RTF 문서',
+            metafileExportName: '압축 된 메타 파일',
+            csvExportName: 'CSV',
+            tiffExportName: 'Tiff 이미지',
+            bmpExportName: 'BMP 이미지',
+            emfExportName: '향상 된 메타 파일',
+            gifExportName: 'GIF 이미지',
+            jpgExportName: 'JPEG 이미지',
+            jpegExportName: 'JPEG 이미지',
+            pngExportName: 'PNG 이미지',
+            parameters: 'Parameters',
+            requiringParameters: '매개 변수를 입력 하십시오.',
+            nullParameterError: '값은 null일 수 없습니다.',
+            invalidParameterError: '잘못된 입력입니다.',
+            parameterNoneItemsSelected: '(없음)',
+            parameterAllItemsSelected: '(모두)',
+            parameterSelectAllItemText: '(모두 선택)',
+            selectParameterValue: '(값을 선택)',
+            apply: '적용',
+            errorOccured: '오류가 발생했습니다.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.ko.js.map
-

src/wijmo/controls/cultures/wijmo.culture.pt.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.pt.js

@@ -1,27 +1,29 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: pt (Portuguese)
-*/
+ * Wijmo culture file: pt (Portuguese)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'pt',
+            displayName: 'Portuguese',
             numberFormat: {
                 '.': ',',
                 ',': '.',
                 percent: { pattern: ['-n%', 'n%'] },
-                currency: { decimals: 2, symbol: 'R$', pattern: ['-$ n', '$ n'] }
+                currency: { decimals: 2, symbol: 'R$', pattern: ['-$n', '$n'] }
             },
             calendar: {
                 '/': '/',
@@ -42,18 +44,31 @@ var wijmo;
                     y: 'MMMM" de "yyyy', Y: 'MMMM" de "yyyy',
                     g: 'dd/MM/yyyy HH:mm', G: 'dd/MM/yyyy HH:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} itens selecionados'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} itens)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} itens)'
         },
         FlexGridFilter: {
-            header: 'Mostrar items com valor',
-            and: 'E',
-            or: 'Ou',
+            // filter
+            ascending: '\u2191 Crescente',
+            descending: '\u2193 Decrescente',
             apply: 'Aplicar',
             clear: 'Remover',
+            conditions: 'Condições',
+            values: 'Valores',
+            // value filter
+            search: 'Filtro',
+            selectAll: 'Selecionar Todos',
+            null: '(nulo)',
+            // condition filter
+            header: 'Mostrar itens com valor',
+            and: 'E',
+            or: 'Ou',
             stringOperators: [
                 { name: '(nenhum)', op: null },
                 { name: 'Igual a', op: 0 },
@@ -83,9 +98,182 @@ var wijmo;
                 { name: 'Igual a', op: 0 },
                 { name: 'Diferente de', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Configurações do Campo:',
+                header: 'Título:',
+                summary: 'Resumo:',
+                showAs: 'Mostrar como:',
+                weighBy: 'Pesar por:',
+                sort: 'Ordem:',
+                filter: 'Filtro:',
+                format: 'Formato:',
+                sample: 'Exemplo:',
+                edit: 'Editar…',
+                clear: 'Remover',
+                ok: 'OK',
+                cancel: 'Cancelar',
+                none: '(nenhum)',
+                sorts: {
+                    asc: 'Crescente',
+                    desc: 'Decrescente'
+                },
+                aggs: {
+                    sum: 'Soma',
+                    cnt: 'Contagem',
+                    avg: 'Média',
+                    max: 'Máximo',
+                    min: 'Mínimo',
+                    rng: 'Intervalo',
+                    std: 'DesvPad',
+                    var: 'Var',
+                    stdp: 'DesvPadp',
+                    varp: 'Varp'
+                },
+                calcs: {
+                    noCalc: 'Sem Cálculo',
+                    dRow: 'Diferença da linha anterior',
+                    dRowPct: 'Diferença % da linha anterior',
+                    dCol: 'Diferença da coluna anterior',
+                    dColPct: 'Diferença % da coluna anterior',
+                    dPctGrand: '% do total geral',
+                    dPctRow: '% do total da linha',
+                    dPctCol: '% do total da coluna',
+                    dRunTot: 'Total Cumulativo',
+                    dRunTotPct: 'Total Cumulativo %'
+                },
+                formats: {
+                    n0: 'Número Inteiro (n0)',
+                    n2: 'Número (n2)',
+                    c: 'Moeda (c)',
+                    p0: 'Porcentagem (p0)',
+                    p2: 'Porcentagem (p2)',
+                    n2c: 'Milhares (n2,)',
+                    n2cc: 'Milhões (n2,,)',
+                    n2ccc: 'Bilhões (n2,,,)',
+                    d: 'Data (d)',
+                    MMMMddyyyy: 'Mês dia ano (MMMM dd, yyyy)',
+                    dMyy: 'Dia mês ano (d/M/yy)',
+                    ddMyy: 'Dia mês ano (dd/M/yy)',
+                    dMyyyy: 'Dia mês ano (dd/M/yyyy)',
+                    MMMyyyy: 'Mês ano (MMM yyyy)',
+                    MMMMyyyy: 'Mês ano (MMMM yyyy)',
+                    yyyyQq: 'Ano Trimestre (yyyy "Q"q)',
+                    FYEEEEQU: 'Ano Fiscal Trimestre ("FY"EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Total geral',
+                subTotal: 'Subtotal'
+            },
+            PivotPanel: {
+                fields: 'Escolha os campos para adicionar ao relatório:',
+                drag: 'Arraste os campos entre as áreas abaixo:',
+                filters: 'Filtros',
+                cols: 'Colunas',
+                rows: 'Linhas',
+                vals: 'Valores',
+                defer: 'Suspender Atualizações',
+                update: 'Atualizar'
+            },
+            _ListContextMenu: {
+                up: 'Mover para Cima',
+                down: 'Mover para Baixo',
+                first: 'Mover para o início',
+                last: 'Mover para o final',
+                filter: 'Mover para Filtro de Relatório',
+                rows: 'Mover para Rótulos de Linha',
+                cols: 'Mover para Rótulos de Coluna',
+                vals: 'Mover para Valores',
+                remove: 'Remover o Campo',
+                edit: 'Configurar o Campo…',
+                detail: 'Exibir detalhes…'
+            },
+            PivotChart: {
+                by: 'por',
+                and: 'e'
+            },
+            DetailDialog: {
+                header: 'Detalhes:',
+                ok: 'OK',
+                items: '{cnt:n0} itens',
+                item: '{cnt} item',
+                row: 'Linha',
+                col: 'Coluna'
+            }
+        },
+        Viewer: {
+            cancel: 'Cancelar',
+            ok: 'OK',
+            bottom: 'Inferior:',
+            top: 'Superior:',
+            right: 'Direito:',
+            left: 'Esquerda:',
+            margins: 'Margens (polegadas)',
+            orientation: 'Orientação:',
+            paperKind: 'Tipo de papel:',
+            pageSetup: 'Configurar Página',
+            landscape: 'Paisagem',
+            portrait: 'Retrato',
+            pageNumber: 'Número da Página',
+            zoomFactor: 'Fator de zoom',
+            paginated: 'Layout de Impressão',
+            print: 'Imprimir',
+            search: 'Filtro',
+            matchCase: 'Diferenciar maiúsculas de minúsculas',
+            wholeWord: 'Coincidir palavra inteira',
+            searchResults: 'Resultados da Pesquisa',
+            previousPage: 'Página Anterior',
+            nextPage: 'Próxima Página',
+            firstPage: 'Primeira Página',
+            lastPage: 'Última Página',
+            backwardHistory: 'Recuar',
+            forwardHistory: 'Avançar',
+            pageCount: 'Contagem de páginas',
+            selectTool: 'Selecione a ferramenta',
+            moveTool: 'Ferramenta mover',
+            continuousMode: 'Modo de exibição de página contínua',
+            singleMode: 'Modo de exibição de página única',
+            wholePage: 'Ajuste de página inteira',
+            pageWidth: 'Ajuste a largura da página',
+            zoomOut: 'Reduzir',
+            zoomIn: 'Ampliar',
+            exports: 'Exportar',
+            fullScreen: 'Tela inteira',
+            exitFullScreen: 'Sair da tela inteira',
+            thumbnails: 'Miniaturas de página',
+            outlines: 'Mapa do Documento',
+            loading: 'Carregar…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Arquivo da Web (MHTML)',
+            htmlExportName: 'Documento HTML',
+            rtfExportName: 'Documento RTF',
+            metafileExportName: 'Metafiles compactados',
+            csvExportName: 'CSV',
+            tiffExportName: 'Imagens TIFF',
+            bmpExportName: 'Imagens BMP',
+            emfExportName: 'Metafile avançado',
+            gifExportName: 'Imagens GIF',
+            jpgExportName: 'Imagens JPEG',
+            jpegExportName: 'Imagens JPEG',
+            pngExportName: 'Imagens PNG',
+            parameters: 'Parâmetros',
+            requiringParameters: 'Parâmetros de entrada.',
+            nullParameterError: 'O valor não pode ser nulo.',
+            invalidParameterError: 'Entrada inválida.',
+            parameterNoneItemsSelected: '(nenhum)',
+            parameterAllItemsSelected: '(todos)',
+            parameterSelectAllItemText: '(Selecionar tudo)',
+            selectParameterValue: '(selecione o valor)',
+            apply: 'Aplicar',
+            errorOccured: 'Erro.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.pt.js.map
-

src/wijmo/controls/cultures/wijmo.culture.ru.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.ru.js

@@ -1,27 +1,29 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: ru (Russian)
-*/
+ * Wijmo culture file: ru (Russian)
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'ru',
+            displayName: 'Russian',
             numberFormat: {
                 '.': ',',
                 ',': ' ',
                 percent: { pattern: ['-n%', 'n%'] },
-                currency: { decimals: 2, symbol: 'р.', pattern: ['-n $', 'n $'] }
+                currency: { decimals: 2, symbol: '₽', pattern: ['-n $', 'n $'] }
             },
             calendar: {
                 '/': '.',
@@ -33,7 +35,7 @@ var wijmo;
                 monthsAbbr: ['янв', 'фев', 'мар', 'апр', 'май', 'июн', 'июл', 'авг', 'сен', 'окт', 'ноя', 'дек'],
                 am: ['', ''],
                 pm: ['', ''],
-                eras: ['наша эра'],
+                eras: ['н.э.'],
                 patterns: {
                     d: 'dd.MM.yyyy', D: 'd MMMM yyyy "г."',
                     f: 'd MMMM yyyy "г." H:mm', F: 'd MMMM yyyy "г." H:mm:ss',
@@ -42,50 +44,236 @@ var wijmo;
                     y: 'MMMM yyyy', Y: 'MMMM yyyy',
                     g: 'dd.MM.yyyy H:mm', G: 'dd.MM.yyyy H:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '{count:n0} пунктов выбрано'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} наименований)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} наименований)'
         },
         FlexGridFilter: {
-            header: 'Показать строки где значение',
-            and: 'И',
-            or: 'Или',
+            // filter
+            ascending: '\u2191 По возрастанию',
+            descending: '\u2193 По убыванию',
             apply: 'Применить',
-            clear: 'Удалить',
+            clear: 'Очистить',
+            conditions: 'Фильтр по условию',
+            values: 'Фильтр по значению',
+            // value filter
+            search: 'поиск',
+            selectAll: 'Выбрать все',
+            null: '(ничего)',
+            // condition filter
+            header: 'Показать элементы, значение которых',
+            and: 'И',
+            or: 'или',
             stringOperators: [
-                { name: '(Не задано)', op: null },
-                { name: 'равно', op: 0 },
+                { name: '(не задано)', op: null },
+                { name: 'Равно', op: 0 },
                 { name: 'не равно', op: 1 },
                 { name: 'начинается с', op: 6 },
                 { name: 'заканчивается на', op: 7 },
                 { name: 'содержит', op: 8 },
-                { name: 'не содержит', op: 9 }
+                { name: 'Не содержит', op: 9 }
             ],
             numberOperators: [
-                { name: '(Не задано)', op: null },
-                { name: 'равно', op: 0 },
+                { name: '(не задано)', op: null },
+                { name: 'Равно', op: 0 },
                 { name: 'не равно', op: 1 },
-                { name: 'больше чем', op: 2 },
-                { name: 'больше или равно', op: 3 },
-                { name: 'меньше чем', op: 4 },
-                { name: 'меньше или равно', op: 5 }
+                { name: 'Больше, чем', op: 2 },
+                { name: 'Больше или равно', op: 3 },
+                { name: 'меньше, чем', op: 4 },
+                { name: 'Меньше или равно', op: 5 }
             ],
             dateOperators: [
-                { name: '(Не задано)', op: null },
-                { name: 'равно', op: 0 },
+                { name: '(не задано)', op: null },
+                { name: 'Равно', op: 0 },
                 { name: 'до', op: 4 },
                 { name: 'после', op: 3 }
             ],
             booleanOperators: [
-                { name: '(Не задано)', op: null },
-                { name: 'равно', op: 0 },
+                { name: '(не задано)', op: null },
+                { name: 'Равно', op: 0 },
                 { name: 'не равно', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: 'Настройки поля:',
+                header: 'Заголовок:',
+                summary: 'Итог:',
+                showAs: 'Показывать как:',
+                weighBy: 'Вес:',
+                sort: 'Сортировка:',
+                filter: 'Фильтр:',
+                format: 'Формат:',
+                sample: 'Пример:',
+                edit: 'Редактировать…',
+                clear: 'Отменить',
+                ok: 'ОК',
+                cancel: 'Отказаться',
+                none: '(нет)',
+                sorts: {
+                    asc: 'По возрастанию',
+                    desc: 'По убыванию'
+                },
+                aggs: {
+                    sum: 'Сумма',
+                    cnt: 'Количество',
+                    avg: 'Среднее',
+                    max: 'Максимум',
+                    min: 'Минимум',
+                    rng: 'Интервал',
+                    std: 'СтдОткл',
+                    var: 'Дисп',
+                    stdp: 'СтдОтклГенСов',
+                    varp: 'ДиспГенСов'
+                },
+                calcs: {
+                    noCalc: 'Без вычислений',
+                    dRow: 'Разница с предыдущей строкой',
+                    dRowPct: 'Разница с предыдущей строкой в %',
+                    dCol: 'Разница с предыдущей колонкой',
+                    dColPct: 'Разница с предыдущей колонкой в %',
+                    dPctGrand: '% от всего',
+                    dPctRow: '% всего строк',
+                    dPctCol: '% всего столбца',
+                    dRunTot: 'Нарастающий итог',
+                    dRunTotPct: '% работает всего'
+                },
+                formats: {
+                    n0: 'Целое (n0)',
+                    n2: 'Дробное (n2)',
+                    c: 'Валюта (c)',
+                    p0: 'Процент (p0)',
+                    p2: 'Процент (p2)',
+                    n2c: 'Тысячи (n2,)',
+                    n2cc: 'Миллионы (n2,,)',
+                    n2ccc: 'Миллиарды (n2,,,)',
+                    d: 'Дата (d)',
+                    MMMMddyyyy: 'Месяц День Год (MMMM dd, yyyy)',
+                    dMyy: 'День Месяц Год (d/M/yy)',
+                    ddMyy: 'День месяц год (dd/M/yy)',
+                    dMyyyy: 'День Месяц Год (dd/M/yyyy)',
+                    MMMyyyy: 'Месяц Год (MMM yyyy)',
+                    MMMMyyyy: 'Месяц Год (MMMM yyyy)',
+                    yyyyQq: 'Год Квартал (yyyy "Q"q)',
+                    FYEEEEQU: 'Фискальный год Квартал ("FY"EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: 'Общий итог',
+                subTotal: 'Подытог'
+            },
+            PivotPanel: {
+                fields: 'Выберите поля отчета:',
+                drag: 'Перетаскивайте поля между областями:',
+                filters: 'Фильтры',
+                cols: 'Колонки',
+                rows: 'строки',
+                vals: 'Значения',
+                defer: 'Отложить обновление',
+                update: 'Обновить'
+            },
+            _ListContextMenu: {
+                up: 'Вверх',
+                down: 'Вниз',
+                first: 'В начало',
+                last: 'В конец',
+                filter: 'В Фильтры',
+                rows: 'В Строки',
+                cols: 'В Колонки',
+                vals: 'В Значения',
+                remove: 'Удалить поле',
+                edit: 'Настройки поля…',
+                detail: 'Детализация…'
+            },
+            PivotChart: {
+                by: 'по',
+                and: 'и'
+            },
+            DetailDialog: {
+                header: 'Детализация:',
+                ok: 'ОК',
+                items: '{cnt:n0} строк',
+                item: '{cnt} строка',
+                row: 'Строка',
+                col: 'Колонка'
+            }
+        },
+        Viewer: {
+            cancel: 'Отказаться',
+            ok: 'ОК',
+            bottom: 'Внизу:',
+            top: 'Вверх:',
+            right: 'Правильно:',
+            left: 'Слева:',
+            margins: 'Поля (дюймы)',
+            orientation: 'Направление:',
+            paperKind: 'Вид бумаги:',
+            pageSetup: 'изменение разметки страницы',
+            landscape: 'альбомная',
+            portrait: 'книжная',
+            pageNumber: 'Номер страницы',
+            zoomFactor: 'Коэффициент масштабирования',
+            paginated: 'Разметка страницы',
+            print: 'Печать',
+            search: 'поиск',
+            matchCase: 'С учетом регистра',
+            wholeWord: 'Только слово целиком',
+            searchResults: 'Результаты поиска',
+            previousPage: 'Предыдущая страница',
+            nextPage: 'Следующая страница',
+            firstPage: 'Первая страница',
+            lastPage: 'Последняя страница',
+            backwardHistory: 'Назад',
+            forwardHistory: 'вперед',
+            pageCount: 'Число страниц',
+            selectTool: 'Выберите инструмент',
+            moveTool: 'Инструмент "Переместить"',
+            continuousMode: 'Непрерывное представление страницы',
+            singleMode: 'Просмотр одной страницы',
+            wholePage: 'Fit вся страница',
+            pageWidth: 'Fit ширины страницы',
+            zoomOut: 'Уменьшить',
+            zoomIn: 'Увеличить',
+            exports: 'Экспорт',
+            fullScreen: 'Во весь экран',
+            exitFullScreen: 'Выйти из полноэкранного режима',
+            thumbnails: 'Миниатюры страниц',
+            outlines: 'схема документа',
+            loading: 'Загрузка…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Excel Open XML',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Веб-архив (MHTML)',
+            htmlExportName: 'HTML-документ',
+            rtfExportName: 'RTF-документ',
+            metafileExportName: 'Сжатые метафайлы',
+            csvExportName: 'CSV',
+            tiffExportName: 'Изображения TIFF',
+            bmpExportName: 'BMP изображения',
+            emfExportName: 'Расширенный метафайл',
+            gifExportName: 'GIF изображения',
+            jpgExportName: 'Изображения JPEG',
+            jpegExportName: 'Изображения JPEG',
+            pngExportName: 'Изображения PNG',
+            parameters: 'Parameters',
+            requiringParameters: 'Пожалуйста, введите параметры.',
+            nullParameterError: 'Значение не может быть неопределенным.',
+            invalidParameterError: 'Недопустимый ввод.',
+            parameterNoneItemsSelected: '(нет)',
+            parameterAllItemsSelected: '(все)',
+            parameterSelectAllItemText: '(Выбрать все)',
+            selectParameterValue: '(выберите значение)',
+            apply: 'Применить',
+            errorOccured: 'Произошла ошибка.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.ru.js.map
-

src/wijmo/controls/cultures/wijmo.culture.zh.d.ts

@@ -1,15 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-declare module wijmo {
-}
-

src/wijmo/controls/cultures/wijmo.culture.zh.js

@@ -1,22 +1,24 @@
-/*
+/*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
 /*
-* Wijmo culture file: zh (Chinese)
-*/
+ * Wijmo culture file: zh-CN (Chinese (Simplified, PRC))
+ */
 var wijmo;
 (function (wijmo) {
     wijmo.culture = {
         Globalize: {
+            name: 'zh-CN',
+            displayName: 'Chinese (Simplified, PRC)',
             numberFormat: {
                 '.': '.',
                 ',': ',',
@@ -26,7 +28,7 @@ var wijmo;
             calendar: {
                 '/': '/',
                 ':': ':',
-                firstDay: 0,
+                firstDay: 1,
                 days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
                 daysAbbr: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
                 months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
@@ -42,29 +44,42 @@ var wijmo;
                     y: 'yyyy"年"M"月"', Y: 'yyyy"年"M"月"',
                     g: 'yyyy/M/d H:mm', G: 'yyyy/M/d H:mm:ss',
                     s: 'yyyy"-"MM"-"dd"T"HH":"mm":"ss'
-                }
+                },
             }
         },
+        MultiSelect: {
+            itemsSelected: '选定{count:n0}个项目'
+        },
         FlexGrid: {
-            groupHeaderFormat: '{name}: <b>{value} </b>({count:n0} 项)'
+            groupHeaderFormat: '{name}: <b>{value}</b> ({count:n0} 项目)'
         },
         FlexGridFilter: {
-            header: '显示行',
-            and: '与',
-            or: '或',
+            // filter
+            ascending: '\u2191 升序',
+            descending: '\u2193 降序',
             apply: '应用',
             clear: '清除',
+            conditions: '按条件过滤',
+            values: '按值过滤',
+            // value filter
+            search: '搜索',
+            selectAll: '选择全部',
+            null: '(无)',
+            // condition filter
+            header: '显示下列值的项目',
+            and: '和',
+            or: '或',
             stringOperators: [
-                { name: '（空白）', op: null },
+                { name: '(非预设)', op: null },
                 { name: '等于', op: 0 },
                 { name: '不等于', op: 1 },
-                { name: '开始是', op: 6 },
-                { name: '结尾是', op: 7 },
+                { name: '开头为', op: 6 },
+                { name: '结尾为', op: 7 },
                 { name: '包含', op: 8 },
                 { name: '不包含', op: 9 }
             ],
             numberOperators: [
-                { name: '（空白）', op: null },
+                { name: '(非预设)', op: null },
                 { name: '等于', op: 0 },
                 { name: '不等于', op: 1 },
                 { name: '大于', op: 2 },
@@ -73,19 +88,192 @@ var wijmo;
                 { name: '小于或等于', op: 5 }
             ],
             dateOperators: [
-                { name: '（空白）', op: null },
+                { name: '(非预设)', op: null },
                 { name: '等于', op: 0 },
-                { name: '是前', op: 4 },
-                { name: '是后', op: 3 }
+                { name: '之后为', op: 4 },
+                { name: '之前为', op: 3 }
             ],
             booleanOperators: [
-                { name: '（空白）', op: null },
+                { name: '(非预设)', op: null },
                 { name: '等于', op: 0 },
                 { name: '不等于', op: 1 }
             ]
+        },
+        olap: {
+            PivotFieldEditor: {
+                dialogHeader: '字段设置:',
+                header: '头:',
+                summary: '汇总:',
+                showAs: '显示为:',
+                weighBy: '权重:',
+                sort: '排序:',
+                filter: '过滤:',
+                format: '格式:',
+                sample: '示例:',
+                edit: '编辑…',
+                clear: '清除',
+                ok: 'OK',
+                cancel: '取消',
+                none: '(无)',
+                sorts: {
+                    asc: '升序',
+                    desc: '降序'
+                },
+                aggs: {
+                    sum: 'Sum 求和',
+                    cnt: 'Count 总数',
+                    avg: 'Average 平均值',
+                    max: 'Max 最大值',
+                    min: 'Min 最小值',
+                    rng: 'Range 范围',
+                    std: 'StdDev 标准差',
+                    var: 'Var 方差',
+                    stdp: 'StdDevPop 总体标准差',
+                    varp: 'VarPop 总体方差'
+                },
+                calcs: {
+                    noCalc: '不计算',
+                    dRow: '前一行的差异',
+                    dRowPct: '前一行差异的%',
+                    dCol: '前一列的差异',
+                    dColPct: '前一列差异的%',
+                    dPctGrand: '总计的百分比',
+                    dPctRow: '%的行总数',
+                    dPctCol: '%的列合计',
+                    dRunTot: '运行总和',
+                    dRunTotPct: '总运行 %'
+                },
+                formats: {
+                    n0: '整数 (n0)',
+                    n2: '十进制 (n2)',
+                    c: '货币 (c)',
+                    p0: '百分比 (p0)',
+                    p2: '百分比 (p2)',
+                    n2c: '数千人 (n2,)',
+                    n2cc: '数以百万计 (n2,,)',
+                    n2ccc: '数十亿 (n2,,,)',
+                    d: '日期 (d)',
+                    MMMMddyyyy: '月天年 (MMMM dd, yyyy)',
+                    dMyy: '天月年 (d/M/yy)',
+                    ddMyy: '天月年 (dd/M/yy)',
+                    dMyyyy: '天月年 (dd/M/yyyy)',
+                    MMMyyyy: '月年 (MMM yyyy)',
+                    MMMMyyyy: '月年 (MMMM yyyy)',
+                    yyyyQq: '去年季度 (yyyy"Q"q)',
+                    FYEEEEQU: '财政年度季度 ("FY"EEEE "Q"U)'
+                }
+            },
+            PivotEngine: {
+                grandTotal: '总合计',
+                subTotal: '小计'
+            },
+            PivotPanel: {
+                fields: '选择字段:',
+                drag: '在下面的区域之间拖动字段:',
+                filters: '过滤',
+                cols: '列',
+                rows: '行',
+                vals: '值',
+                defer: '延迟更新',
+                update: '更新'
+            },
+            _ListContextMenu: {
+                up: '上移',
+                down: '下移',
+                first: '移动到开始',
+                last: '移动到结尾',
+                filter: '移动到过滤区域',
+                rows: '移动到行区域',
+                cols: '移动到列区域',
+                vals: '移动到值区域',
+                remove: '移除字段',
+                edit: '字段设置…',
+                detail: '显示明细…'
+            },
+            PivotChart: {
+                by: '依据',
+                and: '并且'
+            },
+            DetailDialog: {
+                header: '查看明细:',
+                ok: 'OK',
+                items: '{cnt:n0} 项目',
+                item: '{cnt} 项目',
+                row: '行',
+                col: '列'
+            }
+        },
+        Viewer: {
+            cancel: '取消',
+            ok: 'OK',
+            bottom: '底部:',
+            top: '顶部:',
+            right: '右边:',
+            left: '左边:',
+            margins: '边(英寸)',
+            orientation: '方向:',
+            paperKind: '纸张种类:',
+            pageSetup: '纸张设置',
+            landscape: '横向',
+            portrait: '纵向',
+            pageNumber: '页数',
+            zoomFactor: '放大',
+            paginated: '打印布局',
+            print: '打印',
+            search: '查找',
+            matchCase: '匹配大小写',
+            wholeWord: '匹配整个字符',
+            searchResults: '搜索结果',
+            previousPage: '前一页',
+            nextPage: '下一页',
+            firstPage: '第一页',
+            lastPage: '最后一页',
+            backwardHistory: '向后',
+            forwardHistory: '向前',
+            pageCount: '页数',
+            selectTool: '选择工具',
+            moveTool: '移动工具',
+            continuousMode: '连续多页模式',
+            singleMode: '单页模式',
+            wholePage: '适应整页',
+            pageWidth: '适应页宽',
+            zoomOut: '缩小',
+            zoomIn: '放大',
+            exports: '导出',
+            fullScreen: '全屏',
+            exitFullScreen: '退出全屏',
+            thumbnails: '缩略图',
+            outlines: '文档结构图',
+            loading: '加载中…',
+            pdfExportName: 'Adobe PDF',
+            docxExportName: 'Open XML Word',
+            xlsxExportName: 'Open XML Excel',
+            docExportName: 'Microsoft Word',
+            xlsExportName: 'Microsoft Excel',
+            mhtmlExportName: 'Web archive (MHTML)',
+            htmlExportName: 'HTML 文档',
+            rtfExportName: 'RTF 文档',
+            metafileExportName: '压缩的图元文件',
+            csvExportName: 'CSV',
+            tiffExportName: 'Tiff 图片',
+            bmpExportName: 'BMP 图片',
+            emfExportName: '增强的图元文件',
+            gifExportName: 'GIF 图片',
+            jpgExportName: 'JPG 图片',
+            jpegExportName: 'JPEG 图片',
+            pngExportName: 'PNG 图片',
+            parameters: '参数',
+            requiringParameters: '请输入参数.',
+            nullParameterError: '值不能为空.',
+            invalidParameterError: '无效输入.',
+            parameterNoneItemsSelected: '(空)',
+            parameterAllItemsSelected: '(所有)',
+            parameterSelectAllItemText: '(选择所有)',
+            selectParameterValue: '(选择值)',
+            apply: '适用',
+            errorOccured: '错误发生.'
         }
     };
 })(wijmo || (wijmo = {}));
 ;
 //# sourceMappingURL=wijmo.culture.zh.js.map
-

src/wijmo/controls/wijmo.gauge.d.ts

@@ -1,446 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-/**
-* Defines the @see:RadialGauge, @see:LinearGauge, and @see:BulletGraph
-* controls.
-*
-* Unlike many gauge controls, Wijmo gauges concentrate on the data being
-* displayed, with little extraneous color and markup elements. They were
-* designed to be easy to use and to read, especially on small-screen devices.
-*
-* Wijmo gauges are composed of @see:Range objects. Every Wijmo gauge has
-* at least two ranges: the "face" and the "pointer".
-*
-* <ul><li>
-* The "face" represents the background gauge background. The "min" and "max"
-* properties of the face range correspond to the "min" and "max" properties
-* of the gauge control, and limit the values that can be displayed by the
-* gauge.
-* </li><li>
-* The "pointer" is the range that indicates the gauge's current value. The
-* "max" property of the pointer range corresponds to the "value" property
-* of the gauge.
-* </li></ul>
-*
-* In addition to these two special ranges, gauges may have any number of
-* additional ranges added to their "ranges" collection. These additional
-* ranges can be used for two things:
-*
-* <ul><li>
-* By default, the extra ranges appear as part of the gauge background.
-* This way you can show 'zones' within the gauge, like 'good', 'average',
-* and 'bad' for example.
-* </li><li>
-* If you set the gauge's "showRanges" property to false, the additional
-* ranges are not shown. Instead, they are used to automatically set the
-* color of the "pointer" based on the current value.
-* </li></ul>
-*/
-declare module wijmo.gauge {
-    /**
-    * Specifies which values should be displayed as text.
-    */
-    enum ShowText {
-        /** Do not show any text in the gauge. */
-        None = 0,
-        /** Show the gauge's @see:value as text. */
-        Value = 1,
-        /** Show the gauge's @see:min and @see:max values as text. */
-        MinMax = 2,
-        /** Show the gauge's @see:value, @see:min, and @see:max as text. */
-        All = 3,
-    }
-    /**
-    * Base class for the Wijmo Gauge controls (abstract).
-    */
-    class Gauge extends Control {
-        static _SVGNS: string;
-        static _ctr: number;
-        private _ranges;
-        private _rngElements;
-        private _format;
-        private _showRanges;
-        private _shadow;
-        private _animated;
-        private _animInterval;
-        private _readOnly;
-        private _step;
-        private _showText;
-        private _filterID;
-        private _rangesDirty;
-        private _origin;
-        public _thickness: number;
-        public _initialized: boolean;
-        public _animColor: string;
-        public _face: Range;
-        public _pointer: Range;
-        public _dSvg: HTMLDivElement;
-        public _svg: SVGSVGElement;
-        public _gFace: SVGGElement;
-        public _gRanges: SVGGElement;
-        public _gPointer: SVGGElement;
-        public _gCover: SVGGElement;
-        public _pFace: SVGPathElement;
-        public _pPointer: SVGPathElement;
-        public _filter: SVGFilterElement;
-        public _cValue: SVGCircleElement;
-        public _tValue: SVGTextElement;
-        public _tMin: SVGTextElement;
-        public _tMax: SVGTextElement;
-        /**
-        * Gets or sets the template used to instantiate @see:Gauge controls.
-        */
-        static controlTemplate: string;
-        /**
-        * Initializes a new instance of a @see:Gauge control.
-        *
-        * @param element The DOM element that will host the control, or a selector for the host element (e.g. '#theCtrl').
-        * @param options JavaScript object containing initialization data for the control.
-        */
-        constructor(element: any, options?: any);
-        /**
-        * Gets or sets the value displayed on the gauge.
-        */
-        public value : number;
-        /**
-        * Gets or sets the minimum value that can be displayed on the gauge.
-        */
-        public min : number;
-        /**
-        * Gets or sets the maximum value that can be displayed on the gauge.
-        */
-        public max : number;
-        /**
-        * Gets or sets the starting point used for painting the range.
-        *
-        * By default, this property is set to null, which causes the value range
-        * to start at the gauge's minimum value, or zero if the minimum is less
-        * than zero.
-        */
-        public origin : number;
-        /**
-        * Gets or whether the user can edit the value using the mouse and
-        * the keyboard.
-        */
-        public isReadOnly : boolean;
-        /**
-        * Gets or sets the amount to add or subtract to the @see:value property
-        * when the user presses the arrow keys.
-        */
-        public step : number;
-        /**
-        * Gets or sets the format string used for displaying the gauge values
-        * as text.
-        */
-        public format : string;
-        /**
-        * Gets or sets the thickness of the gauge, on a scale between zero and one.
-        *
-        * Setting the thickness to one causes the gauge to fill as much of the
-        * control area as possible. Smaller values create thinner gauges.
-        */
-        public thickness : number;
-        /**
-        * Gets the @see:Range used to represent the gauge's overall geometry
-        * and appearance.
-        */
-        public face : Range;
-        /**
-        * Gets the @see:Range used to represent the gauge's current value.
-        */
-        public pointer : Range;
-        /**
-        * Gets or sets which values should be displayed as text in the gauge.
-        */
-        public showText : ShowText;
-        /**
-        * Gets or sets whether the gauge should display the ranges contained in the @see:ranges property.
-        *
-        * If this property is set to false, the ranges contained in the @see:ranges property are not
-        * displayed in the gauge. Instead, they are used to interpolate the color of the @see:pointer
-        * range while animating value changes.
-        */
-        public showRanges : boolean;
-        /**
-        * Gets or sets whether the gauge should display a shadow effect.
-        */
-        public hasShadow : boolean;
-        /**
-        * Gets or sets whether the gauge should animate value changes.
-        */
-        public isAnimated : boolean;
-        /**
-        * Gets the collection of ranges in this gauge.
-        */
-        public ranges : collections.ObservableArray;
-        /**
-        * Occurs when the value shown on the gauge changes.
-        */
-        public valueChanged: Event;
-        /**
-        * Raises the @see:valueChanged event.
-        */
-        public onValueChanged(): void;
-        /**
-        * Refreshes the control.
-        *
-        * @param fullUpdate Whether to update the control layout as well as the content.
-        */
-        public refresh(fullUpdate?: boolean): void;
-        /**
-        * Gets a number that corresponds to the value of the gauge at a given point.
-        *
-        * For example:
-        *
-        * <pre>
-        * // hit test a point when the user clicks on the gauge
-        * gauge.hostElement.addEventListener('click', function (e) {
-        *   var ht = gauge.hitTest(e.pageX, e.pageY);
-        *   if (ht != null) {
-        *     console.log('you clicked the gauge at value ' + ht.toString());
-        *   }
-        * });
-        * </pre>
-        *
-        * @param pt Point to investigate, in window coordinates, or a MoueEvent object, or x coordinate of the point.
-        * @param y Y coordinate of the point (if the first parameter is a number).
-        * @return Value of the gauge at the point, or null if the point on the gauge's face.
-        */
-        public hitTest(pt: any, y?: number): number;
-        public _getFilterUrl(): string;
-        public _getRangeElement(rng: Range): SVGPathElement;
-        public _rangeChanged(rng: Range, e: PropertyChangedEventArgs): void;
-        public _createElement(tag: string, parent: SVGElement, cls?: string): Element;
-        public _centerText(e: SVGTextElement, value: number, center: Point): void;
-        public _copy(key: string, value: any): boolean;
-        public _getPercent: (value: any) => number;
-        public _setAttribute(e: SVGElement, att: string, value: string): void;
-        public _updateRange(rng: Range, value?: number): void;
-        public _getPointerColor(value: number): string;
-        public _keyDown(e: KeyboardEvent): void;
-        public _htDown: number;
-        public _mouseDown(e: MouseEvent): void;
-        public _mouseMove(e: MouseEvent): void;
-        public _mouseUp(e: MouseEvent): void;
-        public _applyValue(value: number): void;
-        public _updateRangeElement(e: SVGPathElement, rng: Range, value: number): void;
-        public _updateText(): void;
-        public _getValueFromPoint(pt: Point): any;
-        public _fix(n: any): string;
-    }
-}
-
-declare module wijmo.gauge {
-    /**
-    * Represents the direction in which the pointer of a @see:LinearGauge
-    * increases.
-    */
-    enum GaugeDirection {
-        /** Gauge value increases from left to right. */
-        Right = 0,
-        /** Gauge value increases from right to left. */
-        Left = 1,
-        /** Gauge value increases from bottom to top. */
-        Up = 2,
-        /** Gauge value increases from top to bottom. */
-        Down = 3,
-    }
-    /**
-    * The @see:LinearGauge displays a linear scale with an indicator
-    * that represents a single value and optional ranges to represent
-    * reference values.
-    *
-    * If you set the gauge's @see:isReadOnly property to false, then the
-    * user will be able to edit the value by clicking on the gauge.
-    *
-    * @fiddle:t842jozb
-    */
-    class LinearGauge extends Gauge {
-        private _direction;
-        /**
-        * Initializes a new instance of a @see:LinearGauge control.
-        *
-        * @param element The DOM element that will host the control, or a selector for the host element (e.g. '#theCtrl').
-        * @param options JavaScript object containing initialization data for the control.
-        */
-        constructor(element: any, options?: any);
-        /**
-        * Gets or sets the direction in which the gauge is filled.
-        */
-        public direction : GaugeDirection;
-        public _updateRangeElement(e: SVGPathElement, rng: Range, value: number): void;
-        public _updateText(): void;
-        public _updateSegment(path: SVGPathElement, rc: Rect): void;
-        public _setText(e: SVGTextElement, value: number, rc: Rect, pos: string): void;
-        public _getRangeRect(rng: Range, value?: number): Rect;
-        public _getValueFromPoint(pt: Point): number;
-    }
-}
-
-declare module wijmo.gauge {
-    /**
-    * The @see:RadialGauge displays a circular scale with an indicator
-    * that represents a single value and optional ranges to represent
-    * reference values.
-    *
-    * If you set the gauge's @see:isReadOnly property to false, then the
-    * user will be able to edit the value by clicking on the gauge.
-    *
-    * @fiddle:7ec2144u
-    */
-    class RadialGauge extends Gauge {
-        private _startAngle;
-        private _sweepAngle;
-        private _autoScale;
-        /**
-        * Initializes a new instance of a @see:RadialGauge control.
-        *
-        * @param element The DOM element that will host the control, or a selector for the host element (e.g. '#theCtrl').
-        * @param options JavaScript object containing initialization data for the control.
-        */
-        constructor(element: any, options?: any);
-        /**
-        * Gets or sets the starting angle for the gauge, in degrees.
-        *
-        * Angles are measured clockwise, starting at the 9 o'clock position.
-        */
-        public startAngle : number;
-        /**
-        * Gets or sets the sweeping angle for the gauge, in degrees.
-        *
-        * Angles are measured clockwise, starting at the 9 o'clock position.
-        */
-        public sweepAngle : number;
-        /**
-        * Gets or sets whether the gauge should automatically scale to fill the host element.
-        */
-        public autoScale : boolean;
-        /**
-        * Refreshes the control.
-        *
-        * @param fullUpdate Whether to update the control layout as well as the content.
-        */
-        public refresh(fullUpdate?: boolean): void;
-        public _updateRangeElement(e: SVGPathElement, rng: Range, value: number): void;
-        public _updateText(): void;
-        public _updateSegment(path: SVGPathElement, ctr: Point, rOut: number, rIn: number, start: number, sweep: number): void;
-        public _getPoint(ctr: Point, angle: number, radius: number): Point;
-        public _getValueFromPoint(pt: Point): number;
-    }
-}
-
-declare module wijmo.gauge {
-    /**
-    * The @see:BulletGraph is a type of linear gauge designed specifically for use
-    * in dashboards. It displays a single key measure along with a comparative
-    * measure and qualitative ranges to instantly signal whether the measure is
-    * good, bad, or in some other state.
-    *
-    * Bullet Graphs were created and popularized by dashboard design expert
-    * Stephen Few. You can find more details and examples on
-    * <a href="http://en.wikipedia.org/wiki/Bullet_graph">Wikipedia</a>.
-    *
-    * @fiddle:8uxb1vwf
-    */
-    class BulletGraph extends LinearGauge {
-        public _rngTarget: Range;
-        public _rngGood: Range;
-        public _rngBad: Range;
-        /**
-        * Initializes a new instance of a @see:BulletGraph control.
-        *
-        * @param element The DOM element that will host the control, or a selector for the host element (e.g. '#theCtrl').
-        * @param options JavaScript object containing initialization data for the control.
-        */
-        constructor(element: any, options?: any);
-        /**
-        * Gets or sets the target value for the measure.
-        */
-        public target : number;
-        /**
-        * Gets or sets a reference value considered good for the measure.
-        */
-        public good : number;
-        /**
-        * Gets or sets a reference value considered bad for the measure.
-        */
-        public bad : number;
-        public _getRangeRect(rng: Range, value?: number): Rect;
-    }
-}
-
-declare module wijmo.gauge {
-    /**
-    * Defines ranges to be used with @see:Gauge controls.
-    *
-    * @see:Range objects have @see:min and @see:max properties that
-    * define the range's domain, as well as @see:color and @see:thickness
-    * properties that define the range's appearance.
-    *
-    * Every @see:Gauge control has at least two ranges:
-    * the 'face' defines the minimum and maximum values for the gauge, and
-    * the 'pointer' displays the gauge's current value.
-    *
-    * In addition to the built-in ranges, gauges may have additional
-    * ranges used to display regions of significance (for example,
-    * low, medium, and high values).
-    */
-    class Range {
-        static _ctr: number;
-        private _min;
-        private _max;
-        private _thickness;
-        private _color;
-        private _name;
-        /**
-        * Initializes a new instance of a @see:Range.
-        *
-        * @param name Name of the range.
-        */
-        constructor(name?: string);
-        /**
-        * Gets or sets the minimum value for this range.
-        */
-        public min : number;
-        /**
-        * Gets or sets the maximum value for this range.
-        */
-        public max : number;
-        /**
-        * Gets or sets the color used to display this range.
-        */
-        public color : string;
-        /**
-        * Gets or sets the thickness of this range as a percentage of
-        * the parent gauge's thickness.
-        */
-        public thickness : number;
-        /**
-        * Gets or sets whether the name of this @see:Range.
-        */
-        public name : string;
-        /**
-        * Occurs when the value of a property changes.
-        */
-        public propertyChanged: Event;
-        /**
-        * Raises the @see:propertyChanged event.
-        *
-        * @param e @see:PropertyChangedEventArgs that contains the property
-        * name, old, and new values.
-        */
-        public onPropertyChanged(e: PropertyChangedEventArgs): void;
-        public _setProp(name: string, value: any): void;
-    }
-}
-

src/wijmo/controls/wijmo.grid.filter.d.ts

@@ -1,287 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-/**
-* Defines the @see:FlexGridFilter and associated classes.
-*
-* The @see:FlexGridFilter class is an extension that adds column
-* filtering to @see:FlexGrid controls.
-*
-* This extension depends on the <b>wijmo.grid</b> and <b>wijmo.input</b>
-* modules.
-*
-* The example below shows how you can add a @see:FlexGridFilter to
-* a @see:FlexGrid control.
-*
-* @fiddle:6aax531a
-*/
-declare module wijmo.grid.filter {
-    /**
-    * Implements an Excel-style filter for @see:FlexGrid controls.
-    *
-    * To enable filtering on a @see:FlexGrid control, create an instance
-    * of the @see:FlexGridFilter and pass the grid as a parameter to the
-    * constructor. For example:
-    *
-    * <pre>
-    * // create FlexGrid
-    * var flex = new wijmo.grid.FlexGrid('#gridElement');
-    * // enable filtering on the FlexGrid
-    * var filter = new wijmo.grid.filter.FlexGridFilter(flex);
-    * </pre>
-    *
-    * Once this is done, a filter icon is added to the grid's column headers.
-    * Clicking the icon shows an editor where the user can edit the filter
-    * conditions for that column.
-    *
-    * The @see:FlexGridFilter class depends on the <b>wijmo.grid</b> and
-    * <b>wijmo.input</b> modules.
-    */
-    class FlexGridFilter {
-        static _WJA_FILTER: string;
-        public _grid: FlexGrid;
-        public _filters: ColumnFilter[];
-        public _filterColumns: string[];
-        public _divEdt: HTMLElement;
-        public _edtCol: Column;
-        public _ehBoundsChanged: any;
-        public _ehWheel: any;
-        public _showIcons: boolean;
-        /**
-        * Initializes a new instance of the @see:FlexGridFilter.
-        *
-        * @param grid The @see:FlexGrid to filter.
-        */
-        constructor(grid: FlexGrid);
-        /**
-        * Gets or sets a value indicating whether the @see:FlexGridFilter adds filter
-        * editing buttons to the grid's column headers.
-        */
-        public showFilterIcons : boolean;
-        /**
-        * Gets or sets an array containing the names or bindings of the columns
-        * that have filters.
-        *
-        * Setting this property to null or to an empty array adds filters to all
-        * columns.
-        */
-        public filterColumns : string[];
-        /**
-        * Gets the filter for the given column.
-        *
-        * @param col The @see:Column that the filter applies to.
-        * @param create The value indicating whether to create the filter if it does not exist.
-        */
-        public getColumnFilter(col: Column, create?: boolean): ColumnFilter;
-        /**
-        * Shows the filter editor for the given grid column.
-        *
-        * @param col The @see:Column that contains the filter to edit.
-        */
-        public editColumnFilter(col: any): void;
-        /**
-        * Closes the filter editor.
-        */
-        public closeEditor(): void;
-        /**
-        * Applies the current column filters to the grid.
-        */
-        public apply(): void;
-        /**
-        * Clears all column filters.
-        */
-        public clear(): void;
-        /**
-        * Occurs after the filter is applied.
-        */
-        public filterApplied: Event;
-        /**
-        * Raises the @see:filterApplied event.
-        */
-        public onFilterApplied(): void;
-        public _filter(item: any): boolean;
-        public _formatItem(sender: FlexGrid, e: FormatItemEventArgs): void;
-        public _mouseDown(e: any): void;
-        public _hasAttribute(e: any, att: string): boolean;
-        public _updatePosition(): void;
-        public _boundsChanged(e: any): void;
-        public _wheel(e: any): void;
-    }
-}
-
-declare module wijmo.grid.filter {
-    /**
-    * Defines a filter for a column on a @see:FlexGrid control.
-    *
-    * Column filters contain two conditions that may be combined
-    * using an 'and' or an 'or' operator.
-    *
-    * This class is used by the @see:FlexGridFilter class; you
-    * rarely use it directly.
-    */
-    class ColumnFilter {
-        public _col: Column;
-        public _bnd: Binding;
-        public _c1: FilterCondition;
-        public _c2: FilterCondition;
-        public _and: boolean;
-        /**
-        * Initializes a new instance of a @see:ColumnFilter.
-        *
-        * @param column The column to filter.
-        */
-        constructor(column: Column);
-        /**
-        * Gets the @see:Column to filter.
-        */
-        public column : Column;
-        /**
-        * Gets the first condition in the filter.
-        */
-        public condition1 : FilterCondition;
-        /**
-        * Gets the second condition in the filter.
-        */
-        public condition2 : FilterCondition;
-        /**
-        * Gets a value indicating whether to combine the two conditions
-        * with an AND or an OR operator.
-        */
-        public and : boolean;
-        /**
-        * Gets a value indicating whether the filter is active.
-        *
-        * The filter is active if at least one of the two conditions
-        * has its operator set to a non-null value.
-        */
-        public isActive : boolean;
-        /**
-        * Returns a value indicating whether the given value passes this @see:Filter.
-        *
-        * @param value The value to test.
-        */
-        public apply(value: any): boolean;
-    }
-}
-
-declare module wijmo.grid.filter {
-    /**
-    * The editor used to inspect and modify @see:ColumnFilter objects.
-    *
-    * This class is used by the @see:FlexGridFilter class; you
-    * rarely use it directly.
-    */
-    class ColumnFilterEditor extends Control {
-        public _filter: ColumnFilter;
-        public _cmb1: input.ComboBox;
-        public _val1: any;
-        public _cmb2: input.ComboBox;
-        public _val2: any;
-        public _divHdr: HTMLElement;
-        public _divCmb1: HTMLElement;
-        public _divVal1: HTMLElement;
-        public _divCmb2: HTMLElement;
-        public _divVal2: HTMLElement;
-        public _spAnd: HTMLSpanElement;
-        public _spOr: HTMLSpanElement;
-        public _btnAnd: HTMLInputElement;
-        public _btnOr: HTMLInputElement;
-        public _btnApply: HTMLLinkElement;
-        public _btnClear: HTMLLinkElement;
-        /**
-        * Gets or sets the template used to instantiate @see:ColumnFilterEditor controls.
-        */
-        static controlTemplate: string;
-        public '</div>': any;
-        /**
-        * Initializes a new instance of the @see:ColumnFilterEditor.
-        *
-        * @param element The DOM element that hosts the control, or a selector
-        * for the host element (e.g. '#theCtrl').
-        * @param filter The @see:ColumnFilter to edit.
-        */
-        constructor(element: any, filter: ColumnFilter);
-        /**
-        * Gets a reference to the @see:ColumnFilter being edited.
-        */
-        public filter : ColumnFilter;
-        /**
-        * Occurs after the filter is modified.
-        */
-        public filterChanged: Event;
-        /**
-        * Raises the @see:filterChanged event.
-        */
-        public onFilterChanged(e?: EventArgs): void;
-        public _updateUIFromFilter(): void;
-        public _updateFilterFromUI(): void;
-        public _createOperatorCombo(element: any): input.ComboBox;
-        public _createValueInput(element: any): Control;
-        public _isTimeFormat(fmt: string): boolean;
-        public _btnAndOrChanged(e: any): void;
-        public _btnApplyClearClicked(e: any): void;
-    }
-}
-
-declare module wijmo.grid.filter {
-    /**
-    * Defines a filter condition.
-    *
-    * This class is used by the @see:FlexGridFilter class; you
-    * rarely use it directly.
-    */
-    class FilterCondition {
-        public _op: Operator;
-        public _val: any;
-        public _strVal: string;
-        /**
-        * Gets or sets the operator used by this @see:Condition.
-        */
-        public operator : Operator;
-        /**
-        * Gets or sets the value used by this @see:Condition.
-        */
-        public value : any;
-        /**
-        * Returns a value that determines whether the given value passes this @see:Condition.
-        *
-        * @param value The value to test.
-        */
-        public apply(value: any): boolean;
-    }
-    /**
-    * Specifies filter condition operators.
-    */
-    enum Operator {
-        /** Equals. */
-        EQ = 0,
-        /** Does not equal. */
-        NE = 1,
-        /** Greater than. */
-        GT = 2,
-        /** Greater than or equal to. */
-        GE = 3,
-        /** Less than. */
-        LT = 4,
-        /** Less than or equal to. */
-        LE = 5,
-        /** Begins with. */
-        BW = 6,
-        /** Ends with. */
-        EW = 7,
-        /** Contains. */
-        CT = 8,
-        /** Does not contain. */
-        NC = 9,
-    }
-}
-

src/wijmo/controls/wijmo.grid.grouppanel.d.ts

@@ -1,102 +0,0 @@
-/*
-    *
-    * Wijmo Library 5.20143.39
-    * http://wijmo.com/
-    *
-    * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
-    * sales@wijmo.com
-    * http://wijmo.com/products/wijmo-5/license/
-    *
-    */
-/**
-* Defines the @see:GroupPanel control.
-*/
-declare module wijmo.grid.grouppanel {
-    /**
-    * The @see:GroupPanel control provides a drag/drop UI for editing
-    * groups in a bound @see:FlexGrid control.
-    *
-    * It allows users to drag columns from the @see:FlexGrid into the
-    * panel and to move the groups within the panel. Users may click the
-    * group markers in the panel to sort based on the group column or to
-    * remove groups.
-    *
-    * In order to use a @see:GroupPanel, add it to a page that contains a
-    * @see:FlexGrid control and set the panel's @see:grid property to the
-    * @see:FlexGrid control. For example:
-    *
-    * <pre>// create a FlexGrid
-    * var flex = new wijmo.grid.FlexGrid('#flex-grid');
-    * flex.itemsSource = getData();
-    * // add a GroupPanel to edit data groups
-    * var groupPanel = new wijmo.grid.grouppanel.GroupPanel('#group-panel');
-    * groupPanel.placeholder = "Drag columns here to create groups.";
-    * groupPanel.grid = flex;</pre>
-    */
-    class GroupPanel extends Control {
-        public _g: any;
-        public _gds: collections.ObservableArray;
-        public _hideGroupedCols: boolean;
-        public _maxGroups: number;
-        public _dragCol: Column;
-        public _dragMarker: HTMLElement;
-        public _divMarkers: HTMLElement;
-        public _divPH: HTMLElement;
-        /**
-        * Gets or sets the template used to instantiate @see:GroupPanel controls.
-        */
-        static controlTemplate: string;
-        /**
-        * Initializes a new instance of a @see:GroupPanel control.
-        *
-        * @param element The DOM element that will host the control, or a selector for the host element (e.g. '#theCtrl').
-        * @param options JavaScript object containing initialization data for the control.
-        */
-        constructor(element: any, options?: any);
-        /**
-        * Gets or sets whether the panel should hide grouped columns in the owner grid.
-        *
-        * The @see:FlexGrid displays grouping information in row headers, so it is
-        * usually a good idea to hide grouped columns since they display redundant
-        * information.
-        */
-        public hideGroupedColumns : boolean;
-        /**
-        * Gets or sets the maximum number of groups allowed.
-        */
-        public maxGroups : number;
-        /**
-        * Gets or sets a string to be displayed in the control when it contains no groups.
-        */
-        public placeholder : string;
-        /**
-        * Gets or sets the @see:C1FlexGrid that is connected to this @see:GroupPanel.
-        *
-        * Once a grid is connected to the panel, the panel will display the groups
-        * defined in the grid's data source. Users will be able to drag grid columns
-        * into the panel to create new groups, drag groups withing the panel to
-        * re-arrange the groups, or delete items in the panel to remove the groups.
-        */
-        public grid : FlexGrid;
-        /**
-        * Updates the panel to show the current groups.
-        */
-        public refresh(): void;
-        public _addGroup(col: Column, e: MouseEvent): void;
-        public _moveGroup(marker: HTMLElement, e: MouseEvent): void;
-        public _removeGroup(index: number): void;
-        public _getIndex(e: MouseEvent): number;
-        public _getElementIndex(e: HTMLElement): number;
-        public _draggingColumn(s: FlexGrid, e: CellRangeEventArgs): void;
-        public _itemsSourceChanged(s: FlexGrid, e: EventArgs): void;
-        public _groupsChanged(s: FlexGrid, e: EventArgs): void;
-        public _dragStart(e: any): void;
-        public _dragOver(e: any): void;
-        public _drop(e: MouseEvent): void;
-        public _dragEnd(e: any): void;
-        public _click(e: any): void;
-    }
-}
-

src/wijmo/interop/angular/wijmo.angular.d.ts

@@ -1,19 +1,19 @@
 /*
     *
-    * Wijmo Library 5.20143.39
+    * Wijmo Library 5.20163.234
     * http://wijmo.com/
     *
     * Copyright(c) GrapeCity, Inc.  All rights reserved.
-    * 
-    * Licensed under the Wijmo Commercial License. 
+    *
+    * Licensed under the Wijmo Commercial License.
     * sales@wijmo.com
     * http://wijmo.com/products/wijmo-5/license/
     *
     */
-declare module wijmo {
+declare module wj {
     module interop {
         class ControlMetaFactory {
-            static CreateProp(propertyName: string, propertyType: PropertyType, bindingMode?: BindingMode, enumType?: any, isNativeControlProperty?: boolean, priority?: number): PropDescBase;
+            static CreateProp(propertyName: string, propertyType: PropertyType, changeEvent?: string, enumType?: any, isNativeControlProperty?: boolean, priority?: number): PropDescBase;
             static CreateEvent(eventName: string, isPropChanged?: boolean): EventDescBase;
             static CreateComplexProp(propertyName: string, isArray: boolean, ownsObject?: boolean): ComplexPropDescBase;
             static findProp(propName: string, props: PropDescBase[]): PropDescBase;
@@ -21,34 +21,39 @@ declare module wijmo {
             static findComplexProp(propName: string, props: ComplexPropDescBase[]): ComplexPropDescBase;
             static getMetaData(metaDataId: any): MetaDataBase;
             static getClassName(classRef: any): string;
+            static toCamelCase(s: any): any;
             private static findInArr(arr, propName, value);
         }
         class PropDescBase {
             private _propertyName;
             private _propertyType;
+            private _changeEvent;
             private _enumType;
-            private _bindingMode;
             private _isNativeControlProperty;
             private _priority;
-            constructor(propertyName: string, propertyType: PropertyType, bindingMode?: BindingMode, enumType?: any, isNativeControlProperty?: boolean, priority?: number);
-            public propertyName : string;
-            public propertyType : PropertyType;
-            public enumType : any;
-            public bindingMode : BindingMode;
-            public isNativeControlProperty : boolean;
-            public priority : number;
-            public shouldUpdateSource : boolean;
-            public initialize(options: any): void;
+            constructor(propertyName: string, propertyType: PropertyType, changeEvent?: string, enumType?: any, isNativeControlProperty?: boolean, priority?: number);
+            readonly propertyName: string;
+            readonly propertyType: PropertyType;
+            readonly changeEvent: string;
+            readonly enumType: any;
+            readonly bindingMode: BindingMode;
+            readonly isNativeControlProperty: boolean;
+            readonly priority: number;
+            readonly shouldUpdateSource: boolean;
+            initialize(options: any): void;
+            castValueToType(value: any): any;
+            private _parseDate(value);
         }
         enum PropertyType {
             Boolean = 0,
             Number = 1,
             Date = 2,
             String = 3,
-            Enum = 4,
-            Function = 5,
-            EventHandler = 6,
-            Any = 7,
+            AnyPrimitive = 4,
+            Enum = 5,
+            Function = 6,
+            EventHandler = 7,
+            Any = 8,
         }
         function isSimpleType(type: PropertyType): boolean;
         enum BindingMode {
@@ -59,150 +64,171 @@ declare module wijmo {
             private _eventName;
             private _isPropChanged;
             constructor(eventName: string, isPropChanged?: boolean);
-            public eventName : string;
-            public isPropChanged : boolean;
+            readonly eventName: string;
+            readonly isPropChanged: boolean;
         }
         class ComplexPropDescBase {
-            public propertyName: string;
-            public isArray: boolean;
+            propertyName: string;
+            isArray: boolean;
             private _ownsObject;
             constructor(propertyName: string, isArray: boolean, ownsObject?: boolean);
-            public ownsObject : boolean;
+            readonly ownsObject: boolean;
         }
         class MetaDataBase {
             private _props;
             private _events;
             private _complexProps;
-            public parentProperty: string;
-            public isParentPropertyArray: boolean;
-            public ownsObject: boolean;
-            public parentReferenceProperty: string;
-            constructor(props: PropDescBase[], events?: EventDescBase[], complexProps?: ComplexPropDescBase[], parentProperty?: string, isParentPropertyArray?: boolean, ownsObject?: boolean, parentReferenceProperty?: string);
-            public props : PropDescBase[];
-            public events : EventDescBase[];
-            public complexProps : ComplexPropDescBase[];
-            public add(props: PropDescBase[], events?: EventDescBase[], complexProps?: ComplexPropDescBase[], parentProperty?: string, isParentPropertyArray?: boolean, ownsObject?: boolean): MetaDataBase;
-            public prepare(): void;
+            parentProperty: string;
+            isParentPropertyArray: boolean;
+            ownsObject: boolean;
+            parentReferenceProperty: string;
+            ngModelProperty: string;
+            constructor(props: PropDescBase[], events?: EventDescBase[], complexProps?: ComplexPropDescBase[], parentProperty?: string, isParentPropertyArray?: boolean, ownsObject?: boolean, parentReferenceProperty?: string, ngModelProperty?: string);
+            props: PropDescBase[];
+            events: EventDescBase[];
+            complexProps: ComplexPropDescBase[];
+            add(props: PropDescBase[], events?: EventDescBase[], complexProps?: ComplexPropDescBase[], parentProperty?: string, isParentPropertyArray?: boolean, ownsObject?: boolean, parentReferenceProperty?: string, ngModelProperty?: string): MetaDataBase;
+            addOptions(options: any): this;
+            prepare(): void;
         }
     }
 }
 
 declare module wijmo.angular {
-    class MetaFactory extends interop.ControlMetaFactory {
-        static CreateProp(propertyName: string, propertyType: interop.PropertyType, bindingMode?: interop.BindingMode, enumType?: any, isNativeControlProperty?: boolean, priority?: number): PropDesc;
+    class MetaFactory extends wj.interop.ControlMetaFactory {
+        static CreateProp(propertyName: string, propertyType: wj.interop.PropertyType, changeEvent?: string, enumType?: any, isNativeControlProperty?: boolean, priority?: number): PropDesc;
         static CreateEvent(eventName: string, isPropChanged?: boolean): EventDesc;
         static CreateComplexProp(propertyName: string, isArray: boolean, ownsObject?: boolean): ComplexPropDesc;
         static findProp(propName: string, props: PropDesc[]): PropDesc;
         static findEvent(eventName: string, events: EventDesc[]): EventDesc;
         static findComplexProp(propName: string, props: ComplexPropDesc[]): ComplexPropDesc;
     }
-    class PropDesc extends interop.PropDescBase {
+    class PropDesc extends wj.interop.PropDescBase {
         private _scopeBindingMode;
         private _customHandler;
-        constructor(propertyName: string, propertyType: interop.PropertyType, bindingMode?: interop.BindingMode, enumType?: any, isNativeControlProperty?: boolean, priority?: number);
-        public scopeBindingMode : string;
-        public customHandler : (scope: ng.IScope, control: Control, value: any, oldValue: any, link: WjLink) => void;
+        constructor(propertyName: string, propertyType: wj.interop.PropertyType, changeEvent?: string, enumType?: any, isNativeControlProperty?: boolean, priority?: number);
+        scopeBindingMode: string;
+        customHandler: (scope: ng.IScope, control: wijmo.Control, value: any, oldValue: any, link: WjLink) => any;
     }
-    class EventDesc extends interop.EventDescBase {
+    class EventDesc extends wj.interop.EventDescBase {
     }
-    class ComplexPropDesc extends interop.ComplexPropDescBase {
+    class ComplexPropDesc extends wj.interop.ComplexPropDescBase {
     }
 }
 
 declare module wijmo.angular {
     class WjDirective implements ng.IDirective {
         static _parPropAttr: string;
+        static _wjModelPropAttr: string;
         static _initPropAttr: string;
         static _initEventAttr: string;
         static _cntrlScopeProp: string;
         static _cntrlLinkProp: string;
         static _scopeChildrenProp: string;
+        static _dirIdAttr: string;
         static _optionalAttr: boolean;
+        static _dynaTemplates: boolean;
         static _angStripPrefixes: string[];
-        public link: (scope: ng.IScope, templateElement: ng.IAugmentedJQuery, templateAttributes: ng.IAttributes, controller: any, transclude: ng.ITranscludeFunction) => any;
-        public controller: any;
-        public replace: boolean;
-        public require: any;
-        public restrict: string;
-        public scope: any;
-        public template: string;
-        public transclude: boolean;
-        public _property: string;
-        public _isPropertyArray: boolean;
-        public _ownObject: boolean;
-        public _parentReferenceProperty: string;
-        public _isCustomParentInit: boolean;
-        public _props: PropDesc[];
-        public _events: EventDesc[];
-        public _complexProps: ComplexPropDesc[];
-        public _$parse: any;
+        private static _dirIdCounter;
+        link: (scope: ng.IScope, templateElement: ng.IAugmentedJQuery, templateAttributes: ng.IAttributes, controller: any) => any;
+        controller: any;
+        replace: boolean;
+        require: any;
+        restrict: string;
+        scope: any;
+        template: any;
+        transclude: any;
+        _property: string;
+        _isPropertyArray: boolean;
+        _ownObject: boolean;
+        _parentReferenceProperty: string;
+        _ngModelProperty: string;
+        _isCustomParentInit: boolean;
+        _props: PropDesc[];
+        _events: EventDesc[];
+        _complexProps: ComplexPropDesc[];
+        _$parse: any;
         private _stripReq;
-        public _controlConstructor : any;
-        public _getMetaDataId(): any;
+        private _dirId;
+        readonly _controlConstructor: any;
+        _getMetaDataId(): any;
+        _getMetaData(): wj.interop.MetaDataBase;
         constructor();
         private _initDirective();
-        public _initSharedMeta(): void;
-        public _initProps(): void;
-        public _initEvents(): void;
-        public _createLink(): WjLink;
-        public _controllerImpl(controller: any, scope: any, tElement: any): void;
-        public _initControl(element: any): any;
-        public _isChild(): boolean;
-        public _isParentInitializer(): boolean;
-        public _isParentReferencer(): boolean;
-        public _scopeToAttrName(scopeName: string): string;
-        public _getComplexPropDesc(propName: string): ComplexPropDesc;
+        _initSharedMeta(): void;
+        _initProps(): void;
+        _initEvents(): void;
+        _createLink(): WjLink;
+        _controllerImpl(controller: any, scope: any, tElement: any): void;
+        _initControl(element: any): any;
+        _isChild(): boolean;
+        _isParentInitializer(): boolean;
+        _isParentReferencer(): boolean;
+        _scopeToAttrName(scopeName: string): string;
+        _getComplexPropDesc(propName: string): ComplexPropDesc;
         private _initScopeEvents();
         private _initScopeDescription();
-        public _postLinkFn(): (scope: any, tElement: ng.IAugmentedJQuery, tAttrs: ng.IAttributes, controller?: any) => void;
+        _postLinkFn(): (scope: any, tElement: ng.IAugmentedJQuery, tAttrs: ng.IAttributes, controller?: any) => void;
         private _prepareProps();
         private _stripRequire(index);
+        _getId(): string;
         static _versionOk(minVer: string): boolean;
+        static _removeTransclude(html: string): string;
     }
     class WjLink {
-        public directive: WjDirective;
-        public scope: ng.IScope;
-        public tElement: ng.IAugmentedJQuery;
-        public tAttrs: ng.IAttributes;
-        public controller: any;
-        public directiveTemplateElement: JQuery;
-        public control: any;
-        public parent: WjLink;
+        directive: WjDirective;
+        scope: ng.IScope;
+        tElement: ng.IAugmentedJQuery;
+        tAttrs: ng.IAttributes;
+        controller: any;
+        directiveTemplateElement: JQuery;
+        control: any;
+        parent: WjLink;
+        ngModel: ng.INgModelController;
+        private _ngModelPropDesc;
         private _nonAssignable;
         private _parentPropDesc;
         private _definedProps;
         private _definedEvents;
         private _oldValues;
-        public _isInitialized: boolean;
+        _isInitialized: boolean;
+        private _hasTriggeredInitialized;
+        private _isNgModelInitialized;
         private _scopeSuspend;
         private _suspendedEvents;
+        private _siblingInsertedEH;
+        private _destroyEhUnreg;
+        _areChlildrenReady: boolean;
+        _isDestroyed: boolean;
         constructor();
-        public _link(): void;
-        public _onChildrenReady(): void;
+        _link(): void;
+        _onChildrenReady(): void;
         private _createInstance();
         private _parentReady(parentLink);
-        public _initParent(): void;
-        public _destroy(): void;
+        _initParent(): void;
+        _destroy(): void;
+        private _siblingInserted(e);
         private _notifyReady();
-        public _initControl(): any;
+        _initControl(): any;
         private _prepareControl();
         private _setupScopeWithControlProperties();
         private _initNonAssignable();
-        public _suspendScope(): void;
-        public _resumeScope(): void;
-        public _isScopeSuspended(): boolean;
-        public _isAttrDefined(name: string): boolean;
+        _suspendScope(): void;
+        _resumeScope(): void;
+        _isScopeSuspended(): boolean;
+        _isAttrDefined(name: string): boolean;
         private _isAppliedToParent;
-        public _childInitialized(child: WjLink): void;
-        private _initialized();
+        _childInitialized(child: WjLink): void;
+        private _thisInitialized();
+        _initialized(): void;
         private _appliedToParent();
         private _checkRaiseInitialized();
         private _addWatchers();
         private _addEventHandlers();
         private _addEventHandler(eventDesc);
         private _updateScope(eventInfo?);
+        private _ngModelRender();
         private _castValueToType(value, prop);
-        private _parseDate(value);
         private _isChild();
         private _isParentInitializer();
         private _isParentReferencer();
@@ -211,10 +237,13 @@ declare module wijmo.angular {
         private _useParentObj();
         private _isParentArray();
         private _parentInCtor();
-        public _safeApply(scope: any, name: any, value: any): void;
-        public _shouldApply(scope: any, name: any, value: any): boolean;
-        public _canApply(scope: any, name: any): boolean;
-        public _nullOrValue(value: any): any;
+        private _getNgModelProperty();
+        private _updateNgModelPropDesc();
+        _safeApply(scope: any, name: any, value: any): boolean;
+        _shouldApply(scope: any, name: any, value: any): boolean;
+        _canApply(scope: any, name: any): boolean;
+        _nullOrValue(value: any): any;
+        _getIndex(): number;
     }
 }
 
@@ -223,7 +252,11 @@ declare module wijmo.angular {
 
 declare module wijmo.angular {
     class WjMenuLink extends WjLink {
-        public _link(): void;
+        private _closingApplyTimeOut;
+        _initControl(): any;
+        _initialized(): void;
+        private _fmtItem(s, e);
+        private _loadingItems(s);
     }
 }
 
@@ -235,191 +268,352 @@ declare module wijmo.angular {
 
 declare module wijmo.angular {
     /**
-    * AngularJS directive for the @see:FlexGrid control.
-    *
-    * Use the <b>wj-flex-grid</b> directive to add grids to your AngularJS applications.
-    * Note that directive and parameter names must be formatted as lower-case with dashes
-    * instead of camel-case. For example:
-    *
-    * <pre>&lt;p&gt;Here is a FlexGrid control:&lt;/p&gt;
-    * &lt;wj-flex-grid items-source="data"&gt;
-    *   &lt;wj-flex-grid-column
-    *     header="Country"
-    *     binding="country"&gt;
-    *   &lt;/wj-flex-grid-column&gt;
-    *   &lt;wj-flex-grid-column
-    *     header="Sales"
-    *     binding="sales"&gt;
-    *   &lt;/wj-flex-grid-column&gt;
-    *   &lt;wj-flex-grid-column
-    *     header="Expenses"
-    *     binding="expenses"&gt;
-    *   &lt;/wj-flex-grid-column&gt;
-    *   &lt;wj-flex-grid-column
-    *     header="Downloads"
-    *     binding="downloads"&gt;
-    *   &lt;/wj-flex-grid-column&gt;
-    * &lt;/wj-flex-grid&gt;</pre>
-    *
-    * The example below creates a FlexGrid control and binds it to a 'data' array
-    * exposed by the controller. The grid has three columns, each corresponding to
-    * a property of the objects contained in the source array.
-    *
-    * @fiddle:QNb9X
-    *
-    * The <b>wj-flex-grid</b> directive supports the following attributes:
-    *
-    * <dl class="dl-horizontal">
-    *   <dt>allowAddNew</dt>              <dd><code>@</code> A value indicating whether to show a new row
-    *                                     template so users can add items to the source collection.</dd>
-    *   <dt>allow-delete</dt>             <dd><code>@</code> A value indicating whether the grid deletes
-    *                                     selected rows when the user presses the Delete key.</dd>
-    *   <dt>allow-dragging</dt>           <dd><code>@</code> An @see:AllowDragging value indicating
-    *                                     whether and how the user can drag rows and columns with the mouse.</dd>
-    *   <dt>allow-merging</dt>            <dd><code>@</code> An @see:AllowMerging value indicating
-    *                                     which parts of the grid provide cell merging.</dd>
-    *   <dt>allow-resizing</dt>           <dd><code>@</code> An @see:AllowResizing value indicating
-    *                                     whether users are allowed to resize rows and columns with the mouse.</dd>
-    *   <dt>allow-sorting</dt>            <dd><code>@</code> A boolean value indicating whether users can sort
-    *                                     columns by clicking the column headers.</dd>
-    *   <dt>auto-generate-columns</dt>    <dd><code>@</code> A boolean value indicating whether the grid generates
-    *                                     columns automatically based on the <b>items-source</b>.</dd>
-    *   <dt>child-items-path</dt>         <dd><code>@</code> The name of the property used to generate
-    *                                     child rows in hierarchical grids.</dd>
-    *   <dt>control</dt>                  <dd><code>=</code> A reference to the @see:FlexGrid control
-    *                                     created by this directive.</dd>
-    *   <dt>frozen-columns</dt>           <dd><code>@</code> The number of frozen (non-scrollable) columns in the grid.</dd>
-    *   <dt>frozen-rows</dt>              <dd><code>@</code> The number of frozen (non-scrollable) rows in the grid.</dd>
-    *   <dt>group-header-format</dt>      <dd><code>@</code> The format string used to create the group
-    *                                     header content.</dd>
-    *   <dt>headers-visibility</dt>       <dd><code>=</code> A @see:HeadersVisibility value
-    *                                     indicating whether the row and column headers are visible. </dd>
-    *   <dt>initialized</dt>              <dd><code>&</code> This event occurs after the binding has finished
-    *                                     initializing the control with attribute values.</dd>
-    *   <dt>is-initialized</dt>           <dd><code>=</code> A value indicating whether the binding has finished
-    *                                     initializing the control with attribute values. </dd>
-    *   <dt>item-formatter</dt>           <dd><code>=</code> A function that customizes
-    *                                     cells on this grid.</dd>
-    *   <dt>items-source</dt>             <dd><code>=</code> An array or @see:ICollectionView object that
-    *                                     contains the items shown on the grid.</dd>
-    *   <dt>is-read-only</dt>             <dd><code>@</code> A boolean value indicating whether the user is
-    *                                     prevented from editing grid cells by typing into them.</dd>
-    *   <dt>merge-manager</dt>            <dd><code>=</code> A @see:MergeManager object that specifies
-    *                                     the merged extent of the specified cell.</dd>
-    *   <dt>scroll-position</dt>          <dd><code>=</code> A @see:Point that represents the value of the
-    *                                     grid's scrollbars.</dd>
-    *   <dt>selection</dt>                <dd><code>=</code> A @see:CellRange that represents the
-    *                                     currently selected cells.</dd>
-    *   <dt>selection-mode</dt>           <dd><code>@</code> A @see:SelectionMode value
-    *                                     indicating whether and how the user can select cells.</dd>
-    *   <dt>show-groups</dt>              <dd><code>@</code> A boolean value indicating whether to insert group
-    *                                     rows to delimit data groups.</dd>
-    *   <dt>show-sort</dt>                <dd><code>@</code> A boolean value indicating whether to display sort
-    *                                     indicators in the column headers.</dd>
-    *   <dt>tree-indent</dt>              <dd><code>@</code> The indentation, in pixels, used to offset row
-    *                                     groups of different levels.</dd>
-    *   <dt>beginning-edit</dt>           <dd><code>&</code> Handler for the @see:beginningEdit event.</dd>
-    *   <dt>cell-edit-ended</dt>          <dd><code>&</code> Handler for the @see:cellEditEnded event.</dd>
-    *   <dt>cell-edit-ending</dt>         <dd><code>&</code> Handler for the @see:cellEditEnding event.</dd>
-    *   <dt>prepare-cell-for-edit</dt>    <dd><code>&</code> Handler for the @see:prepareCellForEdit event.</dd>
-    *   <dt>resizing-column</dt>          <dd><code>&</code> Handler for the @see:resizingColumn event.</dd>
-    *   <dt>resized-column</dt>           <dd><code>&</code> Handler for the @see:resizedColumn event.</dd>
-    *   <dt>dragged-column</dt>           <dd><code>&</code> Handler for the @see:draggedColumn event.</dd>
-    *   <dt>dragging-column</dt>          <dd><code>&</code> Handler for the @see:draggingColumn event.</dd>
-    *   <dt>sorted-column</dt>            <dd><code>&</code> Handler for the @see:sortedColumn event.</dd>
-    *   <dt>sorting-column</dt>           <dd><code>&</code> Handler for the @see:sortingColumn event.</dd>
-    *   <dt>deleting-row</dt>             <dd><code>&</code> Handler for the @see:deletingRow event.</dd>
-    *   <dt>dragging-row</dt>             <dd><code>&</code> Handler for the @see:draggingRow event.</dd>
-    *   <dt>dragged-row</dt>              <dd><code>&</code> Handler for the @see:draggedRow event.</dd>
-    *   <dt>resizing-row</dt>             <dd><code>&</code> Handler for the @see:resizingRow event.</dd>
-    *   <dt>resized-row</dt>              <dd><code>&</code> Handler for the @see:resizedRow event.</dd>
-    *   <dt>row-added</dt>                <dd><code>&</code> Handler for the @see:rowAdded event.</dd>
-    *   <dt>row-edit-ended</dt>           <dd><code>&</code> Handler for the @see:rowEditEnded event.</dd>
-    *   <dt>row-edit-ending</dt>          <dd><code>&</code> Handler for the @see:rowEditEnding event.</dd>
-    *   <dt>loaded-rows</dt>              <dd><code>&</code> Handler for the @see:loadedRows event.</dd>
-    *   <dt>loading-rows</dt>             <dd><code>&</code> Handler for the @see:loadingRows event.</dd>
-    *   <dt>group-collapsed-changed</dt>  <dd><code>&</code> Handler for the @see:groupCollapsedChanged event.</dd>
-    *   <dt>group-collapsed-changing</dt> <dd><code>&</code> Handler for the @see:groupCollapsedChanging event.</dd>
-    *   <dt>items-source-changed</dt>     <dd><code>&</code> Handler for the @see:itemsSourceChanged event.</dd>
-    *   <dt>selection-changing</dt>       <dd><code>&</code> Handler for the @see:selectionChanging event.</dd>
-    *   <dt>selection-changed</dt>        <dd><code>&</code> Handler for the @see:selectionChanged event.</dd>
-    *   <dt>scroll-position-changed</dt>  <dd><code>&</code> Handler for the @see:scrollPositionChanged event.</dd>
-    * </dl>
-    *
-    * The <b>wj-flex-grid</b> directive may contain @see:WjFlexGridColumn child directives.
-    */
+        * AngularJS directive for the @see:FlexGrid control.
+        *
+        * Use the <b>wj-flex-grid</b> directive to add grids to your AngularJS applications.
+        * Note that directive and parameter names must be formatted as lower-case with dashes
+        * instead of camel-case. For example:
+        *
+        * <pre>&lt;p&gt;Here is a FlexGrid control:&lt;/p&gt;
+        * &lt;wj-flex-grid items-source="data"&gt;
+        *   &lt;wj-flex-grid-column
+        *     header="Country"
+        *     binding="country"&gt;
+        *   &lt;/wj-flex-grid-column&gt;
+        *   &lt;wj-flex-grid-column
+        *     header="Sales"
+        *     binding="sales"&gt;
+        *   &lt;/wj-flex-grid-column&gt;
+        *   &lt;wj-flex-grid-column
+        *     header="Expenses"
+        *     binding="expenses"&gt;
+        *   &lt;/wj-flex-grid-column&gt;
+        *   &lt;wj-flex-grid-column
+        *     header="Downloads"
+        *     binding="downloads"&gt;
+        *   &lt;/wj-flex-grid-column&gt;
+        * &lt;/wj-flex-grid&gt;</pre>
+        *
+        * The example below creates a FlexGrid control and binds it to a 'data' array
+        * exposed by the controller. The grid has three columns, each corresponding to
+        * a property of the objects contained in the source array.
+        *
+        * @fiddle:QNb9X
+        *
+        * The <b>wj-flex-grid</b> directive supports the following attributes:
+        *
+        * <dl class="dl-horizontal">
+        *   <dt>allow-add-new</dt>              <dd><code>@</code> A value indicating whether to show a new row
+        *                                     template so users can add items to the source collection.</dd>
+        *   <dt>allow-delete</dt>             <dd><code>@</code> A value indicating whether the grid deletes the
+        *                                     selected rows when the Delete key is pressed.</dd>
+        *   <dt>allow-dragging</dt>           <dd><code>@</code> An @see:AllowDragging value indicating
+        *                                     whether and how the user can drag rows and columns with the mouse.</dd>
+        *   <dt>allow-merging</dt>            <dd><code>@</code> An @see:AllowMerging value indicating
+        *                                     which parts of the grid provide cell merging.</dd>
+        *   <dt>allow-resizing</dt>           <dd><code>@</code> An @see:AllowResizing value indicating
+        *                                     whether users are allowed to resize rows and columns with the mouse.</dd>
+        *   <dt>allow-sorting</dt>            <dd><code>@</code> A boolean value indicating whether users can sort
+        *                                     columns by clicking the column headers.</dd>
+        *   <dt>auto-generate-columns</dt>    <dd><code>@</code> A boolean value indicating whether the grid generates
+        *                                     columns automatically based on the <b>items-source</b>.</dd>
+        *   <dt>child-items-path</dt>         <dd><code>@</code> The name of the property used to generate
+        *                                     child rows in hierarchical grids (or an array of property names if items
+        *                                     at different hierarchical levels use different names for their child items).</dd>
+        *   <dt>control</dt>                  <dd><code>=</code> A reference to the @see:FlexGrid control
+        *                                     created by this directive.</dd>
+        *   <dt>defer-resizing</dt>           <dd><code>=</code> A boolean value indicating whether row and column
+        *                                     resizing should be deferred until the user releases the mouse button.</dd>
+        *   <dt>frozen-columns</dt>           <dd><code>@</code> The number of frozen (non-scrollable) columns in the grid.</dd>
+        *   <dt>frozen-rows</dt>              <dd><code>@</code> The number of frozen (non-scrollable) rows in the grid.</dd>
+        *   <dt>group-header-format</dt>      <dd><code>@</code> The format string used to create the group
+        *                                     header content.</dd>
+        *   <dt>headers-visibility</dt>       <dd><code>=</code> A @see:HeadersVisibility value
+        *                                     indicating whether the row and column headers are visible. </dd>
+        *   <dt>ime-enabled</dt>              <dd><code>@</code> Gets or sets a value that determines whether the grid should
+        *                                     support Input Method Editors (IME) while not in edit mode.</dd>
+        *   <dt>initialized</dt>              <dd><code>&</code> This event occurs after the binding has finished
+        *                                     initializing the control with attribute values.</dd>
+        *   <dt>is-initialized</dt>           <dd><code>=</code> A value indicating whether the binding has finished
+        *                                     initializing the control with attribute values. </dd>
+        *   <dt>item-formatter</dt>           <dd><code>=</code> A function that customizes
+        *                                     cells on this grid.</dd>
+        *   <dt>items-source</dt>             <dd><code>=</code> An array or @see:ICollectionView object that
+        *                                     contains the items shown on the grid.</dd>
+        *   <dt>is-read-only</dt>             <dd><code>@</code> A boolean value indicating whether the user is
+        *                                     prevented from editing grid cells by typing into them.</dd>
+        *   <dt>merge-manager</dt>            <dd><code>=</code> A @see:MergeManager object that specifies
+        *                                     the merged extent of the specified cell.</dd>
+        *   <dt>selection-mode</dt>           <dd><code>@</code> A @see:SelectionMode value
+        *                                     indicating whether and how the user can select cells.</dd>
+        *   <dt>show-groups</dt>              <dd><code>@</code> A boolean value indicating whether to insert group
+        *                                     rows to delimit data groups.</dd>
+        *   <dt>show-sort</dt>                <dd><code>@</code> A boolean value indicating whether to display sort
+        *                                     indicators in the column headers.</dd>
+        *   <dt>sort-row-index</dt>           <dd><code>@</code> A number specifying the index of row in the column
+        *                                     header panel that shows and changes the current sort.</dd>
+        *   <dt>tree-indent</dt>              <dd><code>@</code> The indentation, in pixels, used to offset row
+        *                                     groups of different levels.</dd>
+        *   <dt>beginning-edit</dt>           <dd><code>&</code> Handler for the @see:FlexGrid.beginningEdit event.</dd>
+        *   <dt>cell-edit-ended</dt>          <dd><code>&</code> Handler for the @see:FlexGrid.cellEditEnded event.</dd>
+        *   <dt>cell-edit-ending</dt>         <dd><code>&</code> Handler for the @see:FlexGrid.cellEditEnding event.</dd>
+        *   <dt>prepare-cell-for-edit</dt>    <dd><code>&</code> Handler for the @see:FlexGrid.prepareCellForEdit event.</dd>
+        *   <dt>resizing-column</dt>          <dd><code>&</code> Handler for the @see:FlexGrid.resizingColumn event.</dd>
+        *   <dt>resized-column</dt>           <dd><code>&</code> Handler for the @see:FlexGrid.resizedColumn event.</dd>
+        *   <dt>dragged-column</dt>           <dd><code>&</code> Handler for the @see:FlexGrid.draggedColumn event.</dd>
+        *   <dt>dragging-column</dt>          <dd><code>&</code> Handler for the @see:FlexGrid.draggingColumn event.</dd>
+        *   <dt>sorted-column</dt>            <dd><code>&</code> Handler for the @see:FlexGrid.sortedColumn event.</dd>
+        *   <dt>sorting-column</dt>           <dd><code>&</code> Handler for the @see:FlexGrid.sortingColumn event.</dd>
+        *   <dt>deleting-row</dt>             <dd><code>&</code> Handler for the @see:FlexGrid.deletingRow event.</dd>
+        *   <dt>dragging-row</dt>             <dd><code>&</code> Handler for the @see:FlexGrid.draggingRow event.</dd>
+        *   <dt>dragged-row</dt>              <dd><code>&</code> Handler for the @see:FlexGrid.draggedRow event.</dd>
+        *   <dt>resizing-row</dt>             <dd><code>&</code> Handler for the @see:FlexGrid.resizingRow event.</dd>
+        *   <dt>resized-row</dt>              <dd><code>&</code> Handler for the @see:FlexGrid.resizedRow event.</dd>
+        *   <dt>row-added</dt>                <dd><code>&</code> Handler for the @see:FlexGrid.rowAdded event.</dd>
+        *   <dt>row-edit-ended</dt>           <dd><code>&</code> Handler for the @see:FlexGrid.rowEditEnded event.</dd>
+        *   <dt>row-edit-ending</dt>          <dd><code>&</code> Handler for the @see:FlexGrid.rowEditEnding event.</dd>
+        *   <dt>loaded-rows</dt>              <dd><code>&</code> Handler for the @see:FlexGrid.loadedRows event.</dd>
+        *   <dt>loading-rows</dt>             <dd><code>&</code> Handler for the @see:FlexGrid.loadingRows event.</dd>
+        *   <dt>group-collapsed-changed</dt>  <dd><code>&</code> Handler for the @see:FlexGrid.groupCollapsedChanged event.</dd>
+        *   <dt>group-collapsed-changing</dt> <dd><code>&</code> Handler for the @see:FlexGrid.groupCollapsedChanging event.</dd>
+        *   <dt>items-source-changed</dt>     <dd><code>&</code> Handler for the @see:FlexGrid.itemsSourceChanged event.</dd>
+        *   <dt>selection-changing</dt>       <dd><code>&</code> Handler for the @see:FlexGrid.selectionChanging event.</dd>
+        *   <dt>selection-changed</dt>        <dd><code>&</code> Handler for the @see:FlexGrid.selectionChanged event.</dd>
+        *   <dt>got-focus</dt>                <dd><code>&</code> Handler for the @see:FlexGrid.gotFocus event.</dd>
+        *   <dt>lost-focus</dt>               <dd><code>&</code> Handler for the @see:FlexGrid.lostFocus event.</dd>
+        *   <dt>scroll-position-changed</dt>  <dd><code>&</code> Handler for the @see:FlexGrid.scrollPositionChanged event.</dd>
+        * </dl>
+        *
+        * The <b>wj-flex-grid</b> directive may contain @see:WjFlexGridColumn, @see:WjFlexGridCellTemplate and
+        * @see:WjFlexGridDetail child directives.
+        */
     class WjFlexGrid extends WjDirective {
-        public _$compile: ng.ICompileService;
-        public _$interpolate: ng.IInterpolateService;
+        _$compile: ng.ICompileService;
+        _$interpolate: ng.IInterpolateService;
         constructor($compile: ng.ICompileService, $interpolate: ng.IInterpolateService);
-        public _controlConstructor : typeof grid.FlexGrid;
-        public _createLink(): WjLink;
-        public _initProps(): void;
-        private _formatterPropHandler(scope, control, value, oldValue, link);
+        readonly _controlConstructor: typeof grid.FlexGrid;
+        _createLink(): WjLink;
+        _initProps(): void;
     }
     class WjFlexGridLink extends WjLink {
-        public _wrapperFormatter: Function;
-        public _userFormatter: Function;
-        public _onChildrenReady(): void;
-        private _initCellScope(scope, panel, rowIndex, columnIndex);
-        private _getCellTemplate(column);
+        _initControl(): any;
+    }
+    /**
+     * Defines the type of cell to which the template applies.
+     * This value is specified in the <b>cell-type</b> attribute
+     * of the @see:WjFlexGridCellTemplate directive.
+     */
+    enum CellTemplateType {
+        /** Defines a regular (data) cell. */
+        Cell = 0,
+        /** Defines a cell in edit mode. */
+        CellEdit = 1,
+        /** Defines a column header cell. */
+        ColumnHeader = 2,
+        /** Defines a row header cell. */
+        RowHeader = 3,
+        /** Defines a row header cell in edit mode. */
+        RowHeaderEdit = 4,
+        /** Defines a top left cell. */
+        TopLeft = 5,
+        /** Defines a group header cell in a group row. */
+        GroupHeader = 6,
+        /** Defines a regular cell in a group row. */
+        Group = 7,
+        /** Defines a column footer cell. */
+        ColumnFooter = 8,
+        /** Defines a bottom left cell (at the intersection of the row header and column footer cells). **/
+        BottomLeft = 9,
+    }
+}
+
+declare module wijmo.angular {
+    /**
+     * AngularJS directive for the @see:PivotGrid control.
+     *
+     * Use the <b>wj-pivot-grid</b> and <b>wj-pivot-panel</b> directives
+     * to add pivot tables to your AngularJS applications.
+     *
+     * Directive and parameter names must be formatted as lower-case with dashes
+     * instead of camel-case. For example:
+     *
+     * <pre>&lt;wj-pivot-panel
+     *     control="thePanel"
+     *     items-source="rawData"&gt;
+     * &lt;/wj-pivot-panel&gt;
+     * &lt;wj-pivot-grid
+     *     items-source="thePanel"
+     *     show-detail-on-double-click="false"
+     *     custom-context-menu="true"&gt;
+     * &lt;/wj-pivot-grid&gt;</pre>
+     *
+     * The <b>wj-pivot-grid</b> directive extends the <b>wj-flex-grid</b> directive
+     * and adds support for the following attributes:
+     *
+     * <dl class="dl-horizontal">
+     *   <dt>items-source</dt>                  <dd>Gets or sets the @see:PivotPanel that defines the view
+     *                                              displayed by this @see:PivotGrid.</dd>
+     *   <dt>show-detail-on-double-click</dt>   <dd>Gets or sets whether the grid should show a popup containing the
+     *                                              detail records when the user double-clicks a cell.</dd>
+     *   <dt>custom-context-menu</dt>           <dd>Gets or sets whether the grid should provide a custom context menu
+     *                                              with commands for changing field settings and showing detail records.</dd>
+     *   <dt>collapsible-subtotals</dt>         <dd>Gets or sets whether the grid should allow users to collapse and
+     *                                              expand subtotal groups of rows and columns.</dd>
+     *   <dt>center-headers-vertically</dt>     <dd>Gets or sets whether the content of header cells should be vertically centered.</dd>
+     * </dl>
+     */
+    class WjPivotGrid extends WjFlexGrid {
+        constructor($compile: ng.ICompileService, $interpolate: ng.IInterpolateService);
+        readonly _controlConstructor: typeof olap.PivotGrid;
     }
+    /**
+     * AngularJS directive for the @see:PivotChart control.
+     *
+     * Use the <b>wj-pivot-chart</b> and <b>wj-pivot-panel</b> directives
+     * to add pivot charts to your AngularJS applications.
+     *
+     * Directive and parameter names must be formatted as lower-case with dashes
+     * instead of camel-case. For example:
+     *
+     * <pre>&lt;wj-pivot-panel
+     *     control="thePanel"
+     *     items-source="rawData"&gt;
+     * &lt;/wj-pivot-panel&gt;
+     * &lt;wj-pivot-chart
+     *     items-source="thePanel"
+     *     chart-type="Bar"
+     *     max-series="10"
+     *     max-points="100"&gt;
+     * &lt;/wj-pivot-chart&gt;</pre>
+     *
+     * The <b>wj-pivot-chart</b> directive supports the following attributes:
+     *
+     * <dl class="dl-horizontal">
+     *   <dt>items-source</dt>                  <dd>Gets or sets the @see:PivotPanel that defines the view
+     *                                              displayed by this @see:PivotChart.</dd>
+     *   <dt>chart-type</dt>                    <dd>Gets or sets a @see:PivotChartType value that defines
+     *                                              the type of chart to display.</dd>
+     *   <dt>show-hierarchical-axes</dt>        <dd>Gets or sets whether the chart should group axis annotations for grouped data.</dd>
+     *   <dt>stacking</dt>                      <dd>Gets or sets a @see:Stacking value that determines whether and how the series
+     *                                              objects are stacked.</dd>
+     *   <dt>show-totals</dt>                   <dd>Gets or sets a whether the chart should include only totals.</dd>
+     *   <dt>max-series</dt>                    <dd>Gets or sets the maximum number of data series to be shown in the chart.</dd>
+     *   <dt>max-points</dt>                    <dd>Gets or sets the maximum number of points to be shown in each series.</dd>
+     * </dl>
+     */
+    class WjPivotChart extends WjDirective {
+        readonly _controlConstructor: typeof olap.PivotChart;
+    }
+    /**
+     * AngularJS directive for the @see:PivotPanel control.
+     *
+     * Use the <b>wj-pivot-panel</b> directive as a data source for
+     * <b>wj-pivot-grid</b> and <b>wj-pivot-chart</b> directives
+     * to add pivot tables and charts to your AngularJS applications.
+     *
+     * Directive and parameter names must be formatted as lower-case with dashes
+     * instead of camel-case. For example:
+     *
+     * <pre>&lt;wj-pivot-panel
+     *     control="thePanel"
+     *     items-source="rawData"&gt;
+     * &lt;/wj-pivot-panel&gt;
+     * &lt;wj-pivot-grid
+     *     items-source="thePanel"
+     *     show-detail-on-double-click="false"
+     *     custom-context-menu="true"&gt;
+     * &lt;/wj-pivot-grid&gt;</pre>
+     *
+     * The <b>wj-pivot-panel</b> directive supports the following attributes:
+     *
+     * <dl class="dl-horizontal">
+     *   <dt>items-source</dt>                  <dd>Gets or sets the raw data used to generate pivot views.</dd>
+     *   <dt>auto-generate-fields</dt>          <dd>Gets or sets whether the panel should populate its fields
+     *                                              collection automatically based on the @see:PivotPanel.itemsSource.</dd>
+     *   <dt>view-definition</dt>               <dd>Gets or sets the current pivot view definition as a JSON string.</dd>
+     *   <dt>engine</dt>                        <dd>Gets a reference to the @see:PivotEngine that summarizes the data.</dd>
+     * </dl>
+     */
+    class WjPivotPanel extends WjDirective {
+        constructor();
+        readonly _controlConstructor: typeof olap.PivotPanel;
+    }
+}
+
+declare module wijmo.angular {
 }
 
 /**
-* Contains AngularJS directives for the Wijmo controls.
-*
-* The directives allow you to add Wijmo controls to
-* <a href="https://angularjs.org/" target="_blank">AngularJS</a>
-* applications using simple markup in HTML pages.
-*
-* You can use directives as regular HTML tags in the page markup. The
-* tag name corresponds to the control name, prefixed with "wj-," and the
-* attributes correspond to the names of control properties and events.
-*
-* All control, property, and event names within directives follow
-* the usual AngularJS convention of replacing camel-casing with hyphenated
-* lower-case names.
-*
-* AngularJS directive parameters come in three flavors, depending on the
-* type of binding they use. The table below describes each one:
-*
-* <dl class="dl-horizontal">
-*   <dt><code>@</code></dt>   <dd>By value, or one-way binding. The attribute
-*                             value is interpreted as a literal.</dd>
-*   <dt><code>=</code></dt>   <dd>By reference, or two-way binding. The
-*                             attribute value is interpreted as an expression.</dd>
-*   <dt><code>&</code></dt>   <dd>Function binding. The attribute value
-*                             is interpreted as a function call, including the parameters.</dd>
-* </dl>
-*
-* For more details on the different binding types, please see <a href=
-* "http://weblogs.asp.net/dwahlin/creating-custom-angularjs-directives-part-2-isolate-scope"
-* target="_blank"> Dan Wahlin's blog on directives</a>.
-*
-* The documentation does not describe directive events because they are identical to
-* the control events, and the binding mode is always the same (function binding).
-*
-* To illustrate, here is the markup used to create a @see:ComboBox control:
-*
-* <pre>&lt;wj-combo-box
-*   text="ctx.theCountry"
-*   items-source="ctx.countries"
-*   is-editable="true"
-*   selected-index-changed="ctx.selChanged(s, e)"&gt;
-*   &lt;/wj-combo-box&gt;</pre>
-*
-* Notice that the <b>text</b> property of the @see:ComboBox is bound to a controller
-* variable called "ctx.theCountry." The binding goes two ways; changes in the control
-* update the scope, and changes in the scope update the control. To
-* initialize the <b>text</b> property with a string constant, enclose
-* the attribute value in single quotes (for example, <code>text="'constant'"</code>).
-*
-* Notice also that the <b>selected-index-changed</b> event is bound to a controller
-* method called "selChanged," and that the binding includes the two event parameters
-* (without the parameters, the method is not called).
-* Whenever the control raises the event, the directive invokes the controller method.
-*/
+ * Contains AngularJS directives for the Wijmo controls.
+ *
+ * The directives allow you to add Wijmo controls to
+ * <a href="https://angularjs.org/" target="_blank">AngularJS</a>
+ * applications using simple markup in HTML pages.
+ *
+ * You can use directives as regular HTML tags in the page markup. The
+ * tag name corresponds to the control name, prefixed with "wj-," and the
+ * attributes correspond to the names of control properties and events.
+ *
+ * All control, property, and event names within directives follow
+ * the usual AngularJS convention of replacing camel-casing with hyphenated
+ * lower-case names.
+ *
+ * AngularJS directive parameters come in three flavors, depending on the
+ * type of binding they use. The table below describes each one:
+ *
+ * <dl class="dl-horizontal">
+ *   <dt><code>@</code></dt>   <dd>By value, or one-way binding. The attribute
+ *                             value is interpreted as a literal.</dd>
+ *   <dt><code>=</code></dt>   <dd>By reference, or two-way binding. The
+ *                             attribute value is interpreted as an expression.</dd>
+ *   <dt><code>&</code></dt>   <dd>Function binding. The attribute value
+ *                             is interpreted as a function call, including the parameters.</dd>
+ * </dl>
+ *
+ * For more details on the different binding types, please see <a href=
+ * "http://weblogs.asp.net/dwahlin/creating-custom-angularjs-directives-part-2-isolate-scope"
+ * target="_blank"> Dan Wahlin's blog on directives</a>.
+ *
+ * The documentation does not describe directive events because they are identical to
+ * the control events, and the binding mode is always the same (function binding).
+ *
+ * To illustrate, here is the markup used to create a @see:ComboBox control:
+ *
+ * <pre>&lt;wj-combo-box
+ *   text="ctx.theCountry"
+ *   items-source="ctx.countries"
+ *   is-editable="true"
+ *   selected-index-changed="ctx.selChanged(s, e)"&gt;
+ * &lt;/wj-combo-box&gt;</pre>
+ *
+ * Notice that the <b>text</b> property of the @see:ComboBox is bound to a controller
+ * variable called "ctx.theCountry." The binding goes two ways; changes in the control
+ * update the scope, and changes in the scope update the control. To
+ * initialize the <b>text</b> property with a string constant, enclose
+ * the attribute value in single quotes (for example, <code>text="'constant'"</code>).
+ *
+ * Notice also that the <b>selected-index-changed</b> event is bound to a controller
+ * method called "selChanged," and that the binding includes the two event parameters
+ * (without the parameters, the method is not called).
+ * Whenever the control raises the event, the directive invokes the controller method.
+ *
+ * All Wijmo Angular directives include an "initialized" event that is
+ * raised after the control has been added to the page and initialized.
+ * You can use this event to perform additional initalization in addition
+ * to setting properties in markup. For example:
+ *
+ * <pre>&lt;wj-flex-grid initialized="initGrid(s,e)"&gt;
+ * &lt;/wj-flex-grid&gt;</pre>
+
+ * <pre>// controller
+ * $scope.initGrid: function(s, e) {
+ *
+ *   // assign a custom MergeManager to the grid
+ *   s.mergeManager = new CustomMergeManager(s);
+ *
+ * }</pre>
+ *
+ */
 declare module wijmo.angular {
 }
 

src/wijmo/styles/themes/wijmo.theme.cerulean.css

@@ -1,5 +1,5 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #082d43;
   background: #fcfcfc;
@@ -10,7 +10,7 @@ div[wj-part='cells'] {
   background-image: -webkit-linear-gradient(bottom, #dddddd 0%, #fcfcfc 100%);
   background-image: linear-gradient(to top, #dddddd 0%, #fcfcfc 100%);
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #082d43;
   background: #fcfcfc;
   background-image: -ms-linear-gradient(bottom, #dddddd 0%, #fcfcfc 100%);
@@ -34,10 +34,14 @@ div[wj-part='cells'] {
   background-image: -webkit-linear-gradient(bottom, #033c73 0%, #055baf 100%);
   background-image: linear-gradient(to top, #033c73 0%, #055baf 100%);
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #777777;
   color: #dddddd;
 }
+.wj-flexgrid .wj-marker {
+  background: #2a9fd6;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #efefef;
@@ -58,10 +62,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #033c73;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 0px solid rgba(0, 0, 0, 0.2);
   border-bottom: 0px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #fcfcfc;
@@ -70,7 +77,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #efefef;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e4ecf2;
   color: #082d43;
@@ -80,17 +87,41 @@ div[wj-part='rhcells'] .wj-header {
   background: #d3e0ea;
   color: #082d43;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #082d43;
   border-width: 0px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #082d43;
   border-width: 0px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #125ba1;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #2a9fd6 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #2a9fd6 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #2a9fd6 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #2a9fd6 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #70a438;
   color: #ffffff;
   background-image: -ms-linear-gradient(bottom, #70a438 0%, #8fc554 100%);
@@ -100,17 +131,17 @@ div[wj-part='rhcells'] .wj-header {
   background-image: -webkit-linear-gradient(bottom, #70a438 0%, #8fc554 100%);
   background-image: linear-gradient(to top, #70a438 0%, #8fc554 100%);
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #59822c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #59822c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -141,4 +172,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-cell.wj-frozen {
   border: 0;
 }
-

src/wijmo/styles/themes/wijmo.theme.cocoa.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #26211f;
   background: #f3f3f3;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #26211f;
   background: #f3f3f3;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #54443b;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #c8c7c6;
   color: #000000;
 }
+.wj-flexgrid .wj-marker {
+  background: #2780ec;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #e6e6e6;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #54443b;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #f3f3f3;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #e6e6e6;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #dfe8f2;
   color: #26211f;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #cddbeb;
   color: #26211f;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #26211f;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #26211f;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #696564;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #2780ec !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #2780ec !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #2780ec !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #2780ec !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #5f534c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #7b6c63;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #7b6c63;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -114,4 +145,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #2780ec;
 }
-

src/wijmo/styles/themes/wijmo.theme.coral.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #1b5c74;
   background: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #1b5c74;
   background: #ffffff;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #f7f4df;
   color: #1b5c74;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #ede9d0;
   color: #1b5c74;
 }
+.wj-flexgrid .wj-marker {
+  background: #137ba3;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #f2f2f2;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #f7f4df;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #ffffff;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #f2f2f2;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e4f0f5;
   color: #1b5c74;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #d1e6ee;
   color: #1b5c74;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #1b5c74;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #1b5c74;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #ede9d0;
+  color: #1b5c74;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #137ba3 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #137ba3 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #137ba3 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #137ba3 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #137ba3;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #189dd1;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #189dd1;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -114,4 +145,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #137ba3;
 }
-

src/wijmo/styles/themes/wijmo.theme.cyborg.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #ffffff;
   background: #424242;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #ffffff;
   background: #424242;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #222222;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #777777;
   color: #dddddd;
 }
+.wj-flexgrid .wj-marker {
+  background: #2a9fd6;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #353535;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #222222;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 0px solid rgba(0, 0, 0, 0.2);
   border-bottom: 0px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #424242;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #4f4f4f;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #66b308;
   color: #ffffff;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #74cb09;
   color: #ffffff;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #ffffff;
   border-width: 0px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #ffffff;
   border-width: 0px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #414141;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #2a9fd6 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #2a9fd6 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #2a9fd6 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #2a9fd6 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #424242;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #282828;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #282828;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -117,4 +148,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-cell.wj-frozen {
   border: 0;
 }
-

src/wijmo/styles/themes/wijmo.theme.dark.css

@@ -1,5 +1,5 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #e6e6e6;
   background: #444444;
@@ -10,7 +10,7 @@ div[wj-part='cells'] {
   background-image: -webkit-linear-gradient(bottom, #444444 0%, #636363 100%);
   background-image: linear-gradient(to top, #444444 0%, #636363 100%);
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #e6e6e6;
   background: #444444;
 }
@@ -28,10 +28,14 @@ div[wj-part='cells'] {
   background-image: -webkit-linear-gradient(bottom, #444444 0%, #636363 100%);
   background-image: linear-gradient(to top, #444444 0%, #636363 100%);
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #c3c3c3;
   color: #000000;
 }
+.wj-flexgrid .wj-marker {
+  background: #ff6a00;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #373737;
@@ -52,10 +56,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #444444;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #444444;
@@ -64,27 +71,51 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #515151;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #3a4d59;
-  color: #dddddd;
+  color: #ddd;
 }
 .wj-frozen.wj-alt:not(.wj-header):not(.wj-group):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Alternate frozen cell color */
   background: #445a68;
-  color: #dddddd;
+  color: #ddd;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #e6e6e6;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #e6e6e6;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #636363;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #ff6a00 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #ff6a00 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #ff6a00 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #ff6a00 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #555555;
   color: #ffffff;
   background-image: -ms-linear-gradient(bottom, #555555 0%, #747474 100%);
@@ -94,17 +125,17 @@ div[wj-part='rhcells'] .wj-header {
   background-image: -webkit-linear-gradient(bottom, #555555 0%, #747474 100%);
   background-image: linear-gradient(to top, #555555 0%, #747474 100%);
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #6f6f6f;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #6f6f6f;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0 solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -138,4 +169,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-frozen-col {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
-

src/wijmo/styles/themes/wijmo.theme.darkly.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #dadada;
   background: #464545;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #dadada;
   background: #464545;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #2c2c2c;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #222222;
   color: #dadada;
 }
+.wj-flexgrid .wj-marker {
+  background: #00a379;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #393939;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #2c2c2c;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 0px solid rgba(0, 0, 0, 0.2);
   border-bottom: 0px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #464545;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #535252;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #347199;
   color: #ffffff;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #3a7fac;
   color: #ffffff;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #dadada;
   border-width: 0px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #dadada;
   border-width: 0px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #4b4b4b;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #00a379 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #00a379 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #00a379 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #00a379 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #3498db;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #217dbb;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #217dbb;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -117,4 +148,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-cell.wj-frozen {
   border: 0;
 }
-

src/wijmo/styles/themes/wijmo.theme.flatly.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #2c3e50;
   background: #e9eef0;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #2c3e50;
   background: #e9eef0;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #2c3e50;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #76818d;
   color: #dddfe2;
 }
+.wj-flexgrid .wj-marker {
+  background: #798d8f;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #dfe0e1;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #2c3e50;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #e9eef0;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #dae2e6;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #d6e6ed;
   color: #2c3e50;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #c4dbe5;
   color: #2c3e50;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #2c3e50;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #2c3e50;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #505d6a;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #798d8f !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #798d8f !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #798d8f !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #798d8f !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #18bc9c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #128f76;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #128f76;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -114,4 +145,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #798d8f;
 }
-

src/wijmo/styles/themes/wijmo.theme.grayscale.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #000000;
   background: #f5f5f5;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #000000;
   background: #f5f5f5;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #666666;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #cccccc;
   color: #000000;
 }
+.wj-flexgrid .wj-marker {
+  background: #cccccc;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #e8e8e8;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #666666;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #f5f5f5;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #e8e8e8;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e4e4e4;
   color: #000000;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #d7d7d7;
   color: #000000;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #000000;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #000000;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #858585;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #cccccc !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #cccccc !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #cccccc !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #cccccc !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #dddddd;
   color: #000000;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #c4c4c4;
   color: #000000;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #c4c4c4;
   color: #000000;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -114,4 +145,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #cccccc;
 }
-

src/wijmo/styles/themes/wijmo.theme.highcontrast.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #ffffff;
   background: #000000;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #ffffff;
   background: #000000;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #890d3a;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #eea7c1;
   color: #000000;
 }
+.wj-flexgrid .wj-marker {
+  background: #0021ab;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #000000;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #890d3a;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #000000;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #737373;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #56ae4c;
   color: #ffffff;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #65b85c;
   color: #ffffff;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #ffffff;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #ffffff;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #b12256;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #0021ab !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #0021ab !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #0021ab !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #0021ab !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #b8114e;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #e71562;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #e71562;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -120,4 +151,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-frozen-col {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
-

src/wijmo/styles/themes/wijmo.theme.light.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #666666;
   background: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #666666;
   background: #ffffff;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #eaeaea;
   color: #666666;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #dddddd;
   color: #888888;
 }
+.wj-flexgrid .wj-marker {
+  background: #9ec5e7;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #f2f2f2;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #eaeaea;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #ffffff;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #f2f2f2;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e7eef1;
   color: #666666;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #d7e3e8;
   color: #666666;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #666666;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #666666;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #dddddd;
+  color: #666666;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #9ec5e7 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #9ec5e7 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #9ec5e7 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #9ec5e7 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #eaeaea;
   color: #666666;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #d1d1d1;
   color: #666666;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #d1d1d1;
   color: #666666;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -118,4 +149,3 @@ div[wj-part='rhcells'] .wj-header {
   outline: none;
   box-shadow: none;
 }
-

src/wijmo/styles/themes/wijmo.theme.material.css

@@ -1,130 +1,150 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* Default MDL font size */
+.wj-control,
+.wj-control input {
+  font-size: 16px;
+}
+/* Extra padding in grids and listboxes */
+.wj-cell {
+  padding: 6px;
+}
+.wj-listbox-item {
+  padding: 6px 10px;
+}
+/* Drop-downs */
+.wj-dropdown-panel {
+  box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+}
+/* Backgrounds */
+.wj-content,
 div[wj-part='cells'] {
-  color: #0f314d;
   background: #ffffff;
+  color: #212121;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
-  color: #0f314d;
-  background: #edf1f3;
-}
-.wj-listbox-item:not(.wj-state-selected):hover {
-  background: rgba(0, 0, 0, 0.04);
+.wj-content .wj-input-group .wj-form-control {
+  background: #ffffff;
+  color: #212121;
 }
-/* -- Headers -- */
+/* Headers */
 .wj-header {
-  background: #3076ae;
-  color: #ffffff;
-}
-.wj-flexgrid .wj-group {
-  background: #835992;
-  color: #ffffff;
+  background: #e8e8e8;
+  color: black;
 }
-/* -- Grid -- */
+/* FlexGrid */
 div[wj-part='root'] {
-  background: #f2f2f2;
+  background: #ffffff;
 }
 .wj-state-selected {
-  background: #349b91;
+  background: #3e51b5;
   color: #ffffff;
 }
 .wj-state-multi-selected {
-  background: #4db6ac;
+  background: #7180ce;
   color: #ffffff;
 }
 .wj-input-group .wj-form-control,
 .wj-grid-editor {
-  background: #fff;
-  color: #000000;
+  background: #ffffff;
+  color: #212121;
 }
-div[wj-part='rhcells'] .wj-header {
-  background: #3076ae;
+.wj-cell {
+  border-right: none;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
-  border-right: 0px solid rgba(0, 0, 0, 0.2);
-  border-bottom: 0px solid rgba(0, 0, 0, 0.2);
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.1);
 }
+/* Default grid cell color */
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
-  /* Default grid cell color */
   background: #ffffff;
 }
+/* Alternate grid cell color */
 .wj-alt:not(.wj-header):not(.wj-group):not(.wj-state-selected):not(.wj-state-multi-selected) {
-  /* Alternate grid cell color */
-  background: #f2f2f2;
-}
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
-  /* Default frozen cell color */
-  background: #e4ecf2;
-  color: #0f314d;
-}
-.wj-frozen.wj-alt:not(.wj-header):not(.wj-group):not(.wj-state-selected):not(.wj-state-multi-selected) {
-  /* Alternate frozen cell color */
-  background: #d3e0ea;
-  color: #0f314d;
-}
-.wj-frozen-row {
-  border-bottom-color: #0f314d;
-  border-width: 0px;
-}
-.wj-frozen-col {
-  border-right-color: #0f314d;
-  border-width: 0px;
-}
-/* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
-  background: #5e9dce;
-  color: #ffffff;
-}
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
-  background: #4db6ac;
-  color: #ffffff;
+  background: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
-  background: #4db6ac;
+/* Group row background */
+.wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  background: #2a377c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
-  border: 0px solid rgba(0, 0, 0, 0.2);
-}
-.wj-btn-default {
-  border: 0px solid rgba(0, 0, 0, 0.2);
-}
-.wj-input-group-btn > .wj-btn {
-  border: 0px;
-}
-/* -- Border Radii -- */
+/* Default frozen boundaries */
+.wj-cell.wj-frozen-row {
+  border-bottom-color: black;
+  border-width: 1px;
+}
+.wj-cell.wj-frozen-col {
+  border-right-color: black;
+  border-width: 1px;
+}
+/* Grid headers */
+.wj-header.wj-state-multi-selected {
+  background: #d5d5d5;
+}
+.wj-colheaders .wj-header.wj-state-multi-selected {
+  border-bottom: 3px solid #3e51b5;
+}
+.wj-rowheaders .wj-header.wj-state-multi-selected {
+  border-right: 3px solid #3e51b5;
+}
+/* Marquee */
+.wj-flexgrid .wj-marquee {
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #3e51b5;
+}
+.wj-flexsheet .wj-marquee {
+  border: 2px solid #3e51b5;
+}
+/* Drag marker */
+.wj-flexgrid .wj-marker {
+  background: #e91e63;
+}
+/* Input Controls */
+.wj-control.wj-content.wj-dropdown,
+.wj-inputnumber {
+  background-color: transparent;
+  border: none;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+}
+.wj-control.wj-content .wj-input-group input.wj-form-control {
+  background-color: transparent;
+  padding-bottom: 0;
+  padding-top: 0;
+}
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
+  border-style: none;
+  border-radius: 2px;
+  background-color: rgba(0, 0, 0, 0.02);
+  color: rgba(0, 0, 0, 0.8);
+  min-width: 32px;
+}
+/* Border Radii */
 .wj-content,
 .wj-input-group,
 .wj-btn-group,
 .wj-btn-group-vertical,
-.wj-tooltip,
-.customEdit {
-  border-radius: 0px;
-}
-/* -- Tooltip -- */
 .wj-tooltip {
-  background: #95a5a6;
-  color: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 0;
 }
-/* -- Gauges -- */
-.wj-gauge .wj-pointer path {
-  fill: #349b91;
-}
-.wj-cell,
-.wj-controll:not(.wj-pager) .wj-input-group .wj-form-control {
-  padding-left: 15px;
-  padding-right: 15px;
+/* Tooltip */
+/* style tooltips like https://www.getmdl.io/customize/index.html */
+.wj-tooltip {
+  padding: 20px;
+  color: white;
+  font-weight: bold;
+  background-color: rgba(128, 128, 128, 0.85);
+  border: none;
 }
-.wj-content.wj-dropdown-panel {
-  border: 0;
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-  margin-left: 0 !important;
+/* Gauges */
+.wj-gauge .wj-pointer {
+  fill: #3e51b5;
 }
-.wj-cell.wj-frozen {
-  border: 0;
+.wj-gauge.wj-state-focused circle.wj-pointer {
+  fill: #e91e63;
+  transition: fill .2s;
+  /* delay used in MDL */
 }
-

src/wijmo/styles/themes/wijmo.theme.midnight.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #ffffff;
   background: #0d2c45;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #ffffff;
   background: #0d2c45;
 }
@@ -22,10 +22,14 @@ div[wj-part='cells'] {
   background-image: -webkit-linear-gradient(bottom, #000000 0%, #1f1f1f 100%);
   background-image: linear-gradient(to top, #000000 0%, #1f1f1f 100%);
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #87acca;
   color: #000000;
 }
+.wj-flexgrid .wj-marker {
+  background: #19a26b;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #0d1e2b;
@@ -46,10 +50,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #000000;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #0d2c45;
@@ -58,7 +65,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #113a5a;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #295744;
   color: #ffffff;
@@ -68,17 +75,41 @@ div[wj-part='rhcells'] .wj-header {
   background: #316852;
   color: #ffffff;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #ffffff;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #ffffff;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #1f1f1f;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #19a26b !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #19a26b !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #19a26b !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #19a26b !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #3b546b;
   color: #ffffff;
   background-image: -ms-linear-gradient(bottom, #3b546b 0%, #517392 100%);
@@ -88,17 +119,17 @@ div[wj-part='rhcells'] .wj-header {
   background-image: -webkit-linear-gradient(bottom, #3b546b 0%, #517392 100%);
   background-image: linear-gradient(to top, #3b546b 0%, #517392 100%);
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #4d6e8c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #4d6e8c;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -126,10 +157,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #19a26b;
 }
-.wj-frozen-row {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-}
-.wj-frozen-col {
-  border-right: 1px solid rgba(0, 0, 0, 0.2);
-}
-

src/wijmo/styles/themes/wijmo.theme.minimal.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #666666;
   background: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #666666;
   background: #ffffff;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #dddddd;
   color: #666666;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #e8e8e8;
   color: #999999;
 }
+.wj-flexgrid .wj-marker {
+  background: #a2bdeb;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #f2f2f2;
@@ -44,6 +48,9 @@ div[wj-part='rhcells'] .wj-header {
   border-right: 0px solid rgba(0, 0, 0, 0.2);
   border-bottom: 0px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #ffffff;
@@ -52,31 +59,65 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #f2f2f2;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
-  background: #f2f2f2;
+  background: #e4ecf2;
+  color: #666666;
 }
 .wj-frozen.wj-alt:not(.wj-header):not(.wj-group):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Alternate frozen cell color */
-  background: #f2f2f2;
+  background: #d3e0ea;
+  color: #666666;
+}
+.wj-cell.wj-frozen-row {
+  border-bottom-color: #666666;
+  border-width: 0px;
+}
+.wj-cell.wj-frozen-col {
+  border-right-color: #666666;
+  border-width: 0px;
+}
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #d0d0d0;
+  color: #666666;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #a2bdeb !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #a2bdeb !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #a2bdeb !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #a2bdeb !important;
 }
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #a2bdeb;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #7da2e2;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #7da2e2;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -104,4 +145,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #a2bdeb;
 }
-

src/wijmo/styles/themes/wijmo.theme.modern.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #333333;
   background: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #333333;
   background: #ffffff;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #8bc730;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #abcd77;
   color: #333333;
 }
+.wj-flexgrid .wj-marker {
+  background: #2a9fd6;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #f2f2f2;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #e3e5e1;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 0px solid rgba(0, 0, 0, 0.2);
   border-bottom: 0px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #ffffff;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #f2f2f2;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e4eff2;
   color: #333333;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #d3e5ea;
   color: #333333;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #333333;
   border-width: 0px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #333333;
   border-width: 0px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #a4c96c;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #2a9fd6 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #2a9fd6 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #2a9fd6 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #2a9fd6 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #29a3cc;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #4db7db;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #4db7db;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -117,4 +148,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-cell.wj-frozen {
   border: 0;
 }
-

src/wijmo/styles/themes/wijmo.theme.organic.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #261f15;
   background: #f6f5ed;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #261f15;
   background: #f6f5ed;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #604e31;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #d2cabe;
   color: #000000;
 }
+.wj-flexgrid .wj-marker {
+  background: #90a938;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #eae8e0;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #604e31;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 0 solid rgba(0, 0, 0, 0.2);
   border-bottom: 0 solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0 solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #f6f5ed;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #eeecdc;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e5e2cf;
   color: #261f15;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #dcd8be;
   color: #261f15;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #261f15;
   border-width: 0;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #261f15;
   border-width: 0;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #796b55;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #90a938 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #90a938 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #90a938 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #90a938 !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #90a938;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #abc54f;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #abc54f;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -117,4 +148,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-cell.wj-frozen {
   border: 0;
 }
-

src/wijmo/styles/themes/wijmo.theme.simplex.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #222222;
   background: #ededed;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #222222;
   background: #ededed;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #434545;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #02749c;
   color: #dddddd;
 }
+.wj-flexgrid .wj-marker {
+  background: #589925;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #e0e0e0;
@@ -44,6 +48,9 @@ div[wj-part='rhcells'] .wj-header {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #ededed;
@@ -52,31 +59,65 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #e0e0e0;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
-  background: #e0e0e0;
+  background: #ededed;
+  color: #222222;
 }
 .wj-frozen.wj-alt:not(.wj-header):not(.wj-group):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Alternate frozen cell color */
   background: #e0e0e0;
+  color: #222222;
+}
+.wj-cell.wj-frozen-row {
+  border-bottom-color: #222222;
+  border-width: 1px;
+}
+.wj-cell.wj-frozen-col {
+  border-right-color: #222222;
+  border-width: 1px;
+}
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #636363;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #589925 !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #589925 !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #589925 !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #589925 !important;
 }
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #cd210e;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #a51a0b;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #a51a0b;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -104,4 +145,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-gauge .wj-pointer path {
   fill: #589925;
 }
-

src/wijmo/styles/themes/wijmo.theme.slate.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #4b5860;
   background: #f4f4f4;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #4b5860;
   background: #f4f4f4;
 }
@@ -16,10 +16,14 @@ div[wj-part='cells'] {
   background: #4b5860;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #aaaaaa;
   color: #444444;
 }
+.wj-flexgrid .wj-marker {
+  background: #f7941d;
+}
 /* -- Grid -- */
 div[wj-part='root'] {
   background: #e7e7e7;
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #4b5860;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 0 solid rgba(0, 0, 0, 0.2);
   border-bottom: 0 solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 0 solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #f4f4f4;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #e7e7e7;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #e6eef2;
   color: #4b5860;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #d5e3e9;
   color: #4b5860;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #4b5860;
   border-width: 0;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #4b5860;
   border-width: 0;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #747474;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #f7941d !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #f7941d !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #f7941d !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #f7941d !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #4b5860;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #61727d;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #61727d;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 1px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -117,4 +148,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-cell.wj-frozen {
   border: 0;
 }
-

src/wijmo/styles/themes/wijmo.theme.superhero.css

@@ -1,10 +1,10 @@
-/* -- Backgrounds -- */
-.wj-content:not(.customEdit),
+/* -- Backgrounds -- */
+.wj-content,
 div[wj-part='cells'] {
   color: #ffffff;
   background: #2b3e50;
 }
-.wj-content:not(.customEdit) .wj-input-group .wj-form-control {
+.wj-content .wj-input-group .wj-form-control {
   color: #ffffff;
   background: #2b3e50;
 }
@@ -16,9 +16,13 @@ div[wj-part='cells'] {
   background: #1b2d3d;
   color: #ffffff;
 }
-.wj-flexgrid .wj-group {
+.wj-flexgrid .wj-group:not(.wj-state-selected):not(.wj-state-multi-selected) {
+  /* Group row background */
   background: #4e5d6c;
-  color: #101b25;
+  color: #ffffff;
+}
+.wj-flexgrid .wj-marker {
+  background: #5cb85c;
 }
 /* -- Grid -- */
 div[wj-part='root'] {
@@ -40,10 +44,13 @@ div[wj-part='root'] {
 div[wj-part='rhcells'] .wj-header {
   background: #1b2d3d;
 }
-.wj-cell:not(.wj-frozen-col):not(.wj-frozen-row):not(.wj-frozen) {
+.wj-cell {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
+[dir="rtl"] .wj-cell {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+}
 .wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default grid cell color */
   background: #2b3e50;
@@ -52,7 +59,7 @@ div[wj-part='rhcells'] .wj-header {
   /* Alternate grid cell color */
   background: #344b61;
 }
-.wj-frozen:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
+.wj-frozen.wj-cell:not(.wj-header):not(.wj-group):not(.wj-alt):not(.wj-state-selected):not(.wj-state-multi-selected) {
   /* Default frozen cell color */
   background: #4e5d6c;
   color: #ffffff;
@@ -62,31 +69,55 @@ div[wj-part='rhcells'] .wj-header {
   background: #596a7b;
   color: #ffffff;
 }
-.wj-frozen-row {
+.wj-cell.wj-frozen-row {
   border-bottom-color: #ffffff;
   border-width: 1px;
 }
-.wj-frozen-col {
+.wj-cell.wj-frozen-col {
   border-right-color: #ffffff;
   border-width: 1px;
 }
+.wj-flexgrid .wj-header.wj-state-multi-selected {
+  /* Selected headers */
+  background: #394c5c;
+  color: #ffffff;
+  font-weight: bold;
+}
+.wj-flexgrid .wj-colheaders .wj-header.wj-state-multi-selected {
+  /* Selected column headers */
+  border-bottom: 2px solid #5cb85c !important;
+}
+.wj-flexgrid .wj-rowheaders .wj-header.wj-state-multi-selected {
+  /* Selected row headers */
+  border-right: 2px solid #5cb85c !important;
+}
+.wj-flexgrid .wj-marquee {
+  /* Selection Marquee */
+  position: absolute;
+  box-sizing: border-box;
+  border: 2px solid #5cb85c !important;
+}
+.wj-flexsheet .wj-marquee {
+  /* FlexSheet Marquee Border */
+  border: 2px solid #5cb85c !important;
+}
 /* -- Buttons -- */
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn {
+.wj-content .wj-input-group-btn > .wj-btn,
+.wj-content .wj-btn-group > .wj-btn {
   background: #df691a;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:hover,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:hover {
+.wj-content .wj-input-group-btn > .wj-btn:hover,
+.wj-content .wj-btn-group > .wj-btn:hover {
   background: #b15315;
   color: #ffffff;
 }
-.wj-content:not(.customEdit) .wj-input-group-btn > .wj-btn:focus,
-.wj-content:not(.customEdit) .wj-btn-group > .wj-btn:focus {
+.wj-content .wj-input-group-btn > .wj-btn:focus,
+.wj-content .wj-btn-group > .wj-btn:focus {
   background: #b15315;
   color: #ffffff;
 }
-.wj-content:not(.customEdit):not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
+.wj-content:not(.wj-dropdown-panel):not(.wj-listbox):not(.wj-flexgrid):not(.wj-calendar-outer) {
   border: 0px solid rgba(0, 0, 0, 0.2);
 }
 .wj-btn-default {
@@ -120,4 +151,3 @@ div[wj-part='rhcells'] .wj-header {
 .wj-frozen-col {
   border-right: 1px solid rgba(0, 0, 0, 0.2);
 }
-