Merge pull request montagejs#979 from heatherdouglass/misc-cleanup

Cleanup
ananyasen · Jul 23, 2012 · 1cd0328 · 1cd0328
2 parents bea45f1 + f70c481
commit 1cd0328
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 102 deletions.
diff --git a/samples/sink/ui/components/button-example.reel/button-example.html b/samples/sink/ui/components/button-example.reel/button-example.html
@@ -64,20 +64,6 @@
         ]
     },
 
-    "settingsButton": {
-        "prototype": "montage/ui/button.reel",
-        "properties": {
-            "element": {"#": "settings"},
-            "identifier": "settings"
-        },
-        "listeners": [
-            {
-                "type": "action",
-                "listener": {"@": "owner"}
-            }
-        ]
-    },
-
     "copy": {
         "prototype": "montage/ui/button.reel",
         "properties": {
@@ -140,12 +126,6 @@
             "element": {"#": "accordion3"}
         }
     },
-    "accordion4": {
-        "prototype": "ui/accordion.reel",
-        "properties": {
-            "element": {"#": "accordion4"}
-        }
-    },
 
     "owner": {
         "prototype": "ui/components/button-example.reel",
@@ -420,84 +400,6 @@ <h4>Button groups</h4>
 
 </section>
 
-
-
-
-            <!-- Will add icon support later
-
-            <h4>Adding an image icon</h4>
-
-            <p>To add an image icon to a Button use CSS, either by
-            setting a background image, or with the <code>:before</code> and
-            <code>:after</code> pseudo elements with the <code>content</code>
-            property:</p>
-
-
-            <div class="demo demo4">
-
-                <div class="app">
-                    <button class="btn settings" data-montage-id="settings">Settings</button>
-                </div>
-            </div>
-
-            <section>
-            <ul data-montage-id="accordion4" class="accordion">
-                <li class="accordion-group">
-                    <div class="accordion-heading"><a href="javascript: void(0);" class="accordion-toggle">HTML</a></div>
-                    <div class="accordion-inner montage-hidden" >
-                        <pre class="prettyprint-dark-dark">
-&lt;button class="btn settings" data-montage-id="settings"&gt;Settings&lt;/button&gt;
-</pre>
-                    </div>
-                </li>
-                <li class="accordion-group">
-                    <div class="accordion-heading"><a href="javascript: void(0);" class="accordion-toggle">Serialization</a></div>
-                    <div class="accordion-inner montage-hidden">
-                        <pre class="prettyprint">
-{
-    "settingsButton": {
-        "prototype": "montage/ui/button.reel",
-        "properties": {
-            "element": {"#": "settings"},
-            "identifier": "settings"
-        },
-        "listeners": [
-            {
-                "type": "action",
-                "listener": {"@": "owner"}
-            }
-        ]
-    },
-    "owner": {
-        "prototype": "ui/components/button-example.reel",
-        "properties": {
-            "element": {"#": "buttontest"},
-            "logger": {"@": "logger"}
-        }
-    }
-}
-</pre>
-
-                    </div>
-                </li>
-                <li class="accordion-group">
-                    <div class="accordion-heading"><a href="javascript: void(0);" class="accordion-toggle">CSS</a></div>
-                    <div class="accordion-inner montage-hidden">
-                        <pre class="prettyprint">
-.settings:before {
-    content: url(images/settings.png);
-    vertical-align: middle;
-    display: inline-block;
-    padding-right: 0.5em;
-}
-</pre>
-                    </div>
-                </li>
-            </ul>
-
-
-        </section>-->
-
                     <section>
                         <a href="https://github.com/Motorola-Mobility/montage/tree/v0.11/examples/sink/components/button-example.reel" target="_blank">View source on GitHub</a>
                     </section>

diff --git a/samples/sink/ui/content.reel/content.html b/samples/sink/ui/content.reel/content.html
@@ -164,7 +164,6 @@
                         "converters": {"@": "converters"},
                         "list": {"@": "list"},
                         "repetition": {"@": "repetition"},
-                        "tabs": {"@": "tabs"},
                         "inputText": {"@": "inputText"},
                         "textarea": {"@": "textarea"},
                         "numberInput": {"@": "numberInput"},
@@ -174,8 +173,6 @@
                         "anchor": {"@": "anchor"},
                         "substitution": {"@": "substitution"},
                         "scroller": {"@": "scroller"},
-                        "montageSlider": {"@": "montageSlider"},
-                        "nativeInputRange": {"@": "nativeInputRange"},
                         "translateComposer": {"@": "translateComposer"},
                         "autocomplete": {"@": "autocomplete"},
                         "tokenField": {"@": "tokenField"}

diff --git a/ui/controller/array-controller.js b/ui/controller/array-controller.js
@@ -338,7 +338,6 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
                     this._selectedIndexes = value;
                     this._selectedContentIndexes = newIndexes;
                     this._selectedObjects = null;
-                    console.log("selectedIndexes this._selections = null;");
                     this._selections = null;
                 });
             }