Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 23 files changed
  • 0 commit comments
  • 1 contributor
Showing with 138 additions and 120 deletions.
  1. +3 −2 ample/.htaccess
  2. 0  ample/cultures/{globalize.cultures.js → cultures.js}
  3. +1 −1  ample/languages/aui/elements/filepicker.js
  4. +5 −5 ample/languages/aui/elements/pager.js
  5. +5 −5 ample/languages/aui/elements/panel.js
  6. +1 −1  ample/languages/aui/elements/panelset.js
  7. +2 −2 ample/languages/aui/elements/sidebar.js
  8. +16 −16 ample/languages/aui/themes/default/elements.css
  9. +10 −9 ample/languages/aui/themes/default/style.php
  10. +11 −10 ample/languages/chart/themes/default/style.php
  11. +11 −10 ample/languages/mobile/themes/default/style.php
  12. +11 −10 ample/languages/xforms/themes/default/style.php
  13. +11 −10 ample/languages/xhtml/themes/default/style.php
  14. +11 −9 ample/languages/xul/themes/default/style.php
  15. +12 −0 ample/languages/xul/themes/oschrome/style.php
  16. +11 −0 ample/languages/xul/themes/osmac/style.php
  17. +11 −0 ample/languages/xul/themes/osxp/style.php
  18. +1 −1  ample/runtime/ample.js
  19. +1 −1  ample/runtime/browser.js
  20. +0 −1  ample/runtime/classes/misc/NodeAnimation.js
  21. +1 −1  ample/runtime/compat/XMLHttpRequest.js
  22. +2 −2 ample/source-builder.php
  23. +1 −24 reference/books/ample/runtime/Locale.xml
View
5 ample/.htaccess
@@ -2,7 +2,8 @@
RewriteEngine on
##
-RewriteRule runtime.js source-builder.php?dev=true&path=./
-RewriteRule runtime-prod.js source-builder.php?path=./
+RewriteRule runtime.js source-builder.php?path=./
+RewriteRule runtime-prod.js source-builder.php?prod=true&path=./
RewriteRule languages/([a-z]+)/([a-z]+).js source-builder.php?path=./languages/$1/
+RewriteRule ^(.*)-prod.css($|\?) $1.php?prod=true
RewriteRule ^(.*).css($|\?) $1.php
View
0  ample/cultures/globalize.cultures.js → ample/cultures/cultures.js
File renamed without changes
View
2  ample/languages/aui/elements/filepicker.js
@@ -54,7 +54,7 @@ cAUIElement_filepicker.handlers = {
// Element Render: open
cAUIElement_filepicker.prototype.$getTagOpen = function()
{
- return '<span class="aml-filepicker"><input type="file" class="aml-filepicker--input"' +(this.attributes["disabled"] ? ' disabled="true"' : '')+ ' style="padding-left:3px;" onselectstart="event.cancelBubble=true;" />';
+ return '<span class="aui-filepicker"><input type="file" class="aui-filepicker--input"' +(this.attributes["disabled"] ? ' disabled="true"' : '')+ ' style="padding-left:3px;" onselectstart="event.cancelBubble=true;" />';
};
// Element Render: close
View
10 ample/languages/aui/elements/pager.js
@@ -75,22 +75,22 @@ cAUIElement_pager.prototype._onButtonClick = function(oEvent, sButtonType)
// Element Render: open
cAUIElement_pager.prototype.$getTagOpen = function()
{
- var sHtml = '<table cellpadding="0" cellspacing="0" border="0" class="aml-pager">';
+ var sHtml = '<table cellpadding="0" cellspacing="0" border="0" class="aui-pager">';
sHtml += '<tbody>';
sHtml += '<tr>';
sHtml += '<td width="1">Page:</td>';
sHtml += '<td>';
- sHtml += '<table cellpadding="0" cellspacing="0" border="0" height="100%" class="aml-pager--body">';
+ sHtml += '<table cellpadding="0" cellspacing="0" border="0" height="100%" class="aui-pager--body">';
sHtml += '<tbody>';
sHtml += '<tr>';
for (var nIndex = 0; nIndex < this.attributes["pagesamount"] * 1; nIndex++)
- sHtml += '<td class="aml-pager-item" onmouseover="this.className=this.className.replace(\'normal\', \'hover\');" onmouseout="this.className=this.className.replace(\'hover\', \'normal\');" onmousedown="this.className=this.className.replace(\'hover\', \'active\');" onmouseup="this.className=this.className.replace(\'active\', \'hover\');" onclick="ample.$instance(this)._onItemClick(event, this.cellIndex)">' + nIndex + '</td>';
+ sHtml += '<td class="aui-pager-item" onmouseover="this.className=this.className.replace(\'normal\', \'hover\');" onmouseout="this.className=this.className.replace(\'hover\', \'normal\');" onmousedown="this.className=this.className.replace(\'hover\', \'active\');" onmouseup="this.className=this.className.replace(\'active\', \'hover\');" onclick="ample.$instance(this)._onItemClick(event, this.cellIndex)">' + nIndex + '</td>';
sHtml += '</tr>';
sHtml += '</tbody>';
sHtml += '</table>';
sHtml += '</td>';
- sHtml += '<td width="1" class="aml-pager-item" onclick="ample.$instance(this)._onButtonClick(event, \'back\')">&lt;&lt;</td>';
- sHtml += '<td width="1" class="aml-pager-item" onclick="ample.$instance(this)._onButtonClick(event, \'next\')">&gt;&gt;</td>';
+ sHtml += '<td width="1" class="aui-pager-item" onclick="ample.$instance(this)._onButtonClick(event, \'back\')">&lt;&lt;</td>';
+ sHtml += '<td width="1" class="aui-pager-item" onclick="ample.$instance(this)._onButtonClick(event, \'next\')">&gt;&gt;</td>';
sHtml += '<td> </td>';
sHtml += '</tr>';
sHtml += '</tbody>';
View
10 ample/languages/aui/elements/panel.js
@@ -28,12 +28,12 @@ cAUIElement_panel.prototype.toggle = function() {
// Renderers
cAUIElement_panel.prototype.$getTagOpen = function() {
- return '<div class="aml-panel"' + (this.hasAttribute("style") ? ' style="' + this.getAttribute("style") + '"' : '') + '>\
- <div class="aml-panel--head">\
- <div class="aml-panel--icon"><br /></div>\
- <div class="aml-panel--label">' + this.getAttribute("label")+ '</div>\
+ return '<div class="aui-panel"' + (this.hasAttribute("style") ? ' style="' + this.getAttribute("style") + '"' : '') + '>\
+ <div class="aui-panel--head">\
+ <div class="aui-panel--icon"><br /></div>\
+ <div class="aui-panel--label">' + this.getAttribute("label")+ '</div>\
</div>\
- <div class="aml-panel--gateway">';
+ <div class="aui-panel--gateway">';
};
cAUIElement_panel.prototype.$getTagClose = function() {
View
2  ample/languages/aui/elements/panelset.js
@@ -70,7 +70,7 @@ cAUIElement_panelset.prototype.refresh = function() {
// Renderers
cAUIElement_panelset.prototype.$getTagOpen = function()
{
- return '<div class="aml-panelset' + (this.hasAttribute("rows") ? ' aml-panelset-rows-' : this.hasAttribute("cols") ? ' aml-panelset-cols-' : '')+ '"' + (this.attributes["style"] ? ' style="' + this.attributes["style"] + '"' : '') + '>';
+ return '<div class="aui-panelset' + (this.hasAttribute("rows") ? ' aui-panelset-rows-' : this.hasAttribute("cols") ? ' aui-panelset-cols-' : '')+ '"' + (this.attributes["style"] ? ' style="' + this.attributes["style"] + '"' : '') + '>';
};
cAUIElement_panelset.prototype.$getTagClose = function()
View
4 ample/languages/aui/elements/sidebar.js
@@ -42,8 +42,8 @@ cAUIElement_sidebar.handlers = {
// Element Renderers
cAUIElement_sidebar.prototype.$getTagOpen = function()
{
- var sHtml = '<div' + (this.attributes["style"] ? ' style="' + this.attributes["style"] + '"' : '') + ' class="aml-sidebar';
- sHtml +=(this.attributes["class"] ? " " + "aml-sidebar-" + this.attributes["class"] : '') + '">';
+ var sHtml = '<div' + (this.attributes["style"] ? ' style="' + this.attributes["style"] + '"' : '') + ' class="aui-sidebar';
+ sHtml +=(this.attributes["class"] ? " " + "aui-sidebar-" + this.attributes["class"] : '') + '">';
return sHtml;
};
View
32 ample/languages/aui/themes/default/elements.css
@@ -1,14 +1,14 @@
/*
panelset
*/
-aml|panelset {
+aui|panelset {
/*border: solid 1px red;*/
background-color: silver;
overflow: hidden;
padding-right: 2px;
padding-bottom: 2px;
}
-aml|panel {
+aui|panel {
width: inherit;
height: inherit;
overflow: hidden;
@@ -18,32 +18,32 @@ aml|panel {
border: solid 1px black;
box-sizing: border-box;
}
-aml|panelset[rows] aml|panel {
+aui|panelset[rows] aui|panel {
/*border: solid 1px green;*/
background-color: lightgreen;
}
-aml|panelset[cols] aml|panel {
+aui|panelset[cols] aui|panel {
display: inline-block;
/*border: solid 1px blue;*/
background-color: lightblue;
}
-aml|panel::head {
+aui|panel::head {
border-bottom: solid 1px silver;
height: 18px;
line-height: 16px;
cursor: default;
}
-aml|panel::label {
+aui|panel::label {
font-weight: bold;
}
-aml|panel::icon {
+aui|panel::icon {
margin-top: 1px;
width: 16px;
height: 16px;
float: right;
background: url(../../../xul/themes/default/media/datepicker.gif);
}
-aml|panel::gateway {
+aui|panel::gateway {
overflow: auto;
width: inherit;
height: inherit;
@@ -51,11 +51,11 @@ aml|panel::gateway {
/*
filepicker
*/
-aml|filepicker::input {
+aui|filepicker::input {
width: 150px;
}
-aml|filepicker::input[type=file] {
+aui|filepicker::input[type=file] {
margin: 1px;
box-sizing: border-box;
}
@@ -63,29 +63,29 @@ aml|filepicker::input[type=file] {
/*
pager
*/
-aml|pager {
+aui|pager {
border: solid 1px red;
height: 20px;
}
-aml|pager::body {
+aui|pager::body {
}
-aml|pager-item {
+aui|pager-item {
width: 20px;
cursor: default;
background-color: pink;
}
-aml|pager-item:hover {
+aui|pager-item:hover {
background-color: lightgreen;
}
-aml|pager-item:active {
+aui|pager-item:active {
background-color: lightblue;
}
-aml|pager-item:selected {
+aui|pager-item:selected {
background-color: blue;
}
View
19 ample/languages/aui/themes/default/style.php
@@ -2,21 +2,22 @@
$aFiles = array();
$aFiles[] = "elements.css";
- $sOutput = "@namespace aml \"http://www.amplesdk.com/ns/aml\";\n";
+ $sOutput = "@namespace aui \"http://www.amplesdk.com/ns/aui\";\n";
for ($nIndex = 0; $nIndex < count($aFiles); $nIndex++)
$sOutput .= join('', file($aFiles[$nIndex])) . "\n";
header("Content-type: text/css");
- //
- include("../../../../../resources/compiler/cCSSCompiler.php");
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
- $oCSSCompiler = new cCSSCompiler;
- $oCSSCompiler->readFromString($sOutput);
- $oCSSCompiler->stripComments();
- $oCSSCompiler->stripSpaces();
- $oCSSCompiler->obfuscate();
- $sOutput = $oCSSCompiler->getOutput();
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
echo $sOutput;
?>
View
21 ample/languages/chart/themes/default/style.php
@@ -8,15 +8,16 @@
header("Content-type: text/css");
- //
- include("../../../../../resources/compiler/cCSSCompiler.php");
-/*
- $oCSSCompiler = new cCSSCompiler;
- $oCSSCompiler->readFromString($sOutput);
- $oCSSCompiler->stripComments();
- $oCSSCompiler->stripSpaces();
- $oCSSCompiler->obfuscate();
- $sOutput = $oCSSCompiler->getOutput();
-*/
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
21 ample/languages/mobile/themes/default/style.php
@@ -7,15 +7,16 @@
header("Content-type: text/css");
- //
- include("../../../../../resources/compiler/cCSSCompiler.php");
-/*
- $oCSSCompiler = new cCSSCompiler;
- $oCSSCompiler->readFromString($sOutput);
- $oCSSCompiler->stripComments();
- $oCSSCompiler->stripSpaces();
- $oCSSCompiler->obfuscate();
- $sOutput = $oCSSCompiler->getOutput();
-*/
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
21 ample/languages/xforms/themes/default/style.php
@@ -8,15 +8,16 @@
header("Content-type: text/css");
- //
- include("../../../../../resources/compiler/cCSSCompiler.php");
-/*
- $oCSSCompiler = new cCSSCompiler;
- $oCSSCompiler->readFromString($sOutput);
- $oCSSCompiler->stripComments();
- $oCSSCompiler->stripSpaces();
- $oCSSCompiler->obfuscate();
- $sOutput = $oCSSCompiler->getOutput();
-*/
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
21 ample/languages/xhtml/themes/default/style.php
@@ -11,15 +11,16 @@
header("Content-type: text/css");
- //
- include("../../../../../resources/compiler/cCSSCompiler.php");
-/*
- $oCSSCompiler = new cCSSCompiler;
- $oCSSCompiler->readFromString($sOutput);
- $oCSSCompiler->stripComments();
- $oCSSCompiler->stripSpaces();
- $oCSSCompiler->obfuscate();
- $sOutput = $oCSSCompiler->getOutput();
-*/
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
20 ample/languages/xul/themes/default/style.php
@@ -24,14 +24,16 @@
header("Content-type: text/css");
//
- include("../../../../../resources/compiler/cCSSCompiler.php");
-/*
- $oCSSCompiler = new cCSSCompiler;
- $oCSSCompiler->readFromString($sOutput);
- $oCSSCompiler->stripComments();
- $oCSSCompiler->stripSpaces();
- $oCSSCompiler->obfuscate();
- $sOutput = $oCSSCompiler->getOutput();
-*/
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
12 ample/languages/xul/themes/oschrome/style.php
@@ -8,5 +8,17 @@
header("Content-type: text/css");
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
+
echo $sOutput;
?>
View
11 ample/languages/xul/themes/osmac/style.php
@@ -8,5 +8,16 @@
header("Content-type: text/css");
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
11 ample/languages/xul/themes/osxp/style.php
@@ -8,5 +8,16 @@
header("Content-type: text/css");
+ if (isset($_GET["prod"]) && $_GET["prod"] == "true") {
+ include("../../../../../resources/compiler/cCSSCompiler.php");
+
+ $oCSSCompiler = new cCSSCompiler;
+ $oCSSCompiler->readFromString($sOutput);
+ $oCSSCompiler->stripComments();
+ $oCSSCompiler->stripSpaces();
+ $oCSSCompiler->obfuscate();
+ $sOutput = $oCSSCompiler->getOutput();
+ }
+
echo $sOutput;
?>
View
2  ample/runtime/ample.js
@@ -12,7 +12,7 @@ var hClasses = {};
// Create Ample SDK document object
var oAmple_document = fDOMImplementation_createDocument(new cDOMImplementation, sNS_XHTML, "body", null),
oAmple_root = oAmple_document.documentElement;
-oAmple_root.$getContainer = function(sName) {return sName == "gateway" ? oBrowser_body : sName ? null : oBrowser_root};
+oAmple_root.$getContainer = function(sName) {return sName == "gateway" ? oBrowser_body : sName ? null : oBrowser_root;};
//
function fQuery(vArgument1, vArgument2, vArgument3) {
View
2  ample/runtime/browser.js
@@ -1339,7 +1339,7 @@ function fAmple_initialize() {
//->Source
var nElements = fElement_getElementsByTagName(oAmple_document, '*').length,
- nAnonymous = (function(){var nLength = 0; for (var sKey in oDocument_all) if (oDocument_all.hasOwnProperty(sKey)) nLength++; return nLength})();
+ nAnonymous = (function(){var nLength = 0; for (var sKey in oDocument_all) if (oDocument_all.hasOwnProperty(sKey)) nLength++; return nLength;})();
oUADocument.title = "Ample: " + nElements + " (+" + (nAnonymous - nElements) + " anonymous). " +
"DHTML: " + oUADocument.getElementsByTagName('*').length + ". " +
"CSS time: " + (oDateXML - oDateCSS) + " ms. " +
View
1  ample/runtime/classes/misc/NodeAnimation.js
@@ -217,7 +217,6 @@ function fNodeAnimation_parseValue(sValue) {
sValue = sValue.trim();
var aValue,
- nIndex,
sValueLower = sValue.toLowerCase();
// if standard color used
View
2  ample/runtime/compat/XMLHttpRequest.js
@@ -113,7 +113,7 @@ if (bTrident) {
fReadyStateChange(oRequest);
nState = oRequest.readyState;
- }
+ };
};
cXMLHttpRequest.prototype.send = function(vData) {
/*
View
4 ample/source-builder.php
@@ -1,7 +1,7 @@
<?php
if (isset($_GET["path"])) {
$path = $_GET["path"];
- $dev = isset($_GET["dev"]) && $_GET["dev"] == "true";
+ $prod = isset($_GET["prod"]) && $_GET["prod"] == "true";
$files = file($path . ".files");
$output = "";
@@ -11,7 +11,7 @@
$output = fStripTags($output, "Source");
- if (!$dev) {
+ if ($prod) {
$output = fStripTags($output, "Debug");
$output = fStripTags($output, "Guard");
}
View
25 reference/books/ample/runtime/Locale.xml
@@ -117,29 +117,6 @@
</locale>
</description>
</argument>
- <argument name="culture" type="String" required="true">
- <description>
- <locale>
- Culture name.
- </locale>
- </description>
- </argument>
- <argument name="value" type="String" required="true">
- <description>
- <locale>
- Value to be set.
- </locale>
- </description>
- </argument>
- </arguments>
- <arguments>
- <argument name="key" type="String" required="true">
- <description>
- <locale>
- Key.
- </locale>
- </description>
- </argument>
<argument name="culture" type="String" required="false">
<description>
<locale>
@@ -150,7 +127,7 @@
</arguments>
<description>
<locale>
- Gets or sets a localized value.
+ Gets localized text for key.
</locale>
</description>
</method>

No commit comments for this range

Something went wrong with that request. Please try again.